← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] ~cjwatson/launchpad:py3-test-slave-timeouts into launchpad:master

 

Colin Watson has proposed merging ~cjwatson/launchpad:py3-test-slave-timeouts into launchpad:master.

Commit message:
Fix TestSlaveTimeouts on Python 3

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/395444

DeadProxy's url argument must be bytes.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:py3-test-slave-timeouts into launchpad:master.
diff --git a/lib/lp/buildmaster/tests/test_interactor.py b/lib/lp/buildmaster/tests/test_interactor.py
index c1f4c6d..3fd4cfb 100644
--- a/lib/lp/buildmaster/tests/test_interactor.py
+++ b/lib/lp/buildmaster/tests/test_interactor.py
@@ -705,7 +705,7 @@ class TestSlaveTimeouts(TestCase):
         super(TestSlaveTimeouts, self).setUp()
         self.slave_helper = self.useFixture(SlaveTestHelpers())
         self.clock = Clock()
-        self.proxy = DeadProxy("url")
+        self.proxy = DeadProxy(b"url")
         self.slave = self.slave_helper.getClientSlave(
             reactor=self.clock, proxy=self.proxy)
         self.addCleanup(shut_down_default_process_pool)