launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #28022
[Merge] ~cjwatson/launchpad:launchpad-buildd-206 into launchpad:master
Colin Watson has proposed merging ~cjwatson/launchpad:launchpad-buildd-206 into launchpad:master.
Commit message:
Upgrade to launchpad-buildd 206
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/414606
This renames BuilddSlaveTestSetup to BuilddTestSetup.
Dependencies MP: https://code.launchpad.net/~cjwatson/lp-source-dependencies/+git/lp-source-dependencies/+merge/414605
--
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:launchpad-buildd-206 into launchpad:master.
diff --git a/lib/lp/buildmaster/tests/mock_workers.py b/lib/lp/buildmaster/tests/mock_workers.py
index 4cdc392..c76e76c 100644
--- a/lib/lp/buildmaster/tests/mock_workers.py
+++ b/lib/lp/buildmaster/tests/mock_workers.py
@@ -23,7 +23,7 @@ import sys
import xmlrpc.client
import fixtures
-from lpbuildd.tests.harness import BuilddSlaveTestSetup
+from lpbuildd.tests.harness import BuilddTestSetup
from testtools.content import attach_file
from twisted.internet import defer
from twisted.web.xmlrpc import Proxy
@@ -284,8 +284,8 @@ class DeadProxy(Proxy):
return defer.Deferred()
-class LPBuilddSlaveTestSetup(BuilddSlaveTestSetup):
- """A BuilddSlaveTestSetup that uses the LP virtualenv."""
+class LPBuilddTestSetup(BuilddTestSetup):
+ """A BuilddTestSetup that uses the LP virtualenv."""
def setUp(self):
super().setUp(
@@ -297,15 +297,15 @@ class WorkerTestHelpers(fixtures.Fixture):
@property
def base_url(self):
- """The URL for the XML-RPC service set up by `BuilddSlaveTestSetup`."""
- return 'http://localhost:%d' % LPBuilddSlaveTestSetup().daemon_port
+ """The URL for the XML-RPC service set up by `BuilddTestSetup`."""
+ return 'http://localhost:%d' % LPBuilddTestSetup().daemon_port
def getServerWorker(self):
"""Set up a test build worker server.
- :return: A `BuilddSlaveTestSetup` object.
+ :return: A `BuilddTestSetup` object.
"""
- tachandler = self.useFixture(LPBuilddSlaveTestSetup())
+ tachandler = self.useFixture(LPBuilddTestSetup())
attach_file(
self, tachandler.logfile, name='xmlrpc-log-file', buffer_now=False)
return tachandler
@@ -314,7 +314,7 @@ class WorkerTestHelpers(fixtures.Fixture):
pool=None, process_pool=None):
"""Return a `BuilderWorker` for use in testing.
- Points to a fixed URL that is also used by `BuilddSlaveTestSetup`.
+ Points to a fixed URL that is also used by `BuilddTestSetup`.
"""
return BuilderWorker.makeBuilderWorker(
self.base_url, 'vmhost', config.builddmaster.socket_timeout,
diff --git a/lib/lp/buildmaster/tests/test_manager.py b/lib/lp/buildmaster/tests/test_manager.py
index abb12fa..cf6f584 100644
--- a/lib/lp/buildmaster/tests/test_manager.py
+++ b/lib/lp/buildmaster/tests/test_manager.py
@@ -101,11 +101,7 @@ class TestWorkerScannerScan(StatsMixin, TestCaseWithFactory):
run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=20)
def setUp(self):
- """Set up BuilddSlaveTest.
-
- Also adjust the sampledata in a way a build can be dispatched to
- 'bob' builder.
- """
+ """Make it possible to dispatch builds."""
super().setUp()
# Creating the required chroots needed for dispatching.
self.test_publisher = make_publisher()
diff --git a/requirements/launchpad.txt b/requirements/launchpad.txt
index 86cf5c6..24a3e56 100644
--- a/requirements/launchpad.txt
+++ b/requirements/launchpad.txt
@@ -64,7 +64,7 @@ jsautobuild==0.2
keyring==0.6.2
keystoneauth1==4.1.0
kombu==4.6.11
-launchpad-buildd==193
+launchpad-buildd==206
launchpadlib==1.10.14
lazr.batchnavigator==1.3.1
lazr.config==2.2.3