launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:launchpad-buildd-193 into launchpad:master.

Commit message:
Upgrade to launchpad-buildd 193

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

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

Dependencies MP: https://code.launchpad.net/~cjwatson/lp-source-dependencies/+git/lp-source-dependencies/+merge/392123
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:launchpad-buildd-193 into launchpad:master.

diff --git a/constraints.txt b/constraints.txt
index 2f395d8..4c33491 100644
--- a/constraints.txt
+++ b/constraints.txt
@@ -219,7 +219,7 @@ iso8601==0.1.12
 jsautobuild==0.2
 keyring==0.6.2
 kombu==4.4.0
-launchpad-buildd==159
+launchpad-buildd==193
 launchpadlib==1.10.9
 lazr.authentication==0.1.1
 lazr.batchnavigator==1.3.0
diff --git a/lib/lp/buildmaster/tests/test_interactor.py b/lib/lp/buildmaster/tests/test_interactor.py
index 8f2670a..b081cf5 100644
--- a/lib/lp/buildmaster/tests/test_interactor.py
+++ b/lib/lp/buildmaster/tests/test_interactor.py
@@ -15,7 +15,7 @@ import os
 import signal
 import tempfile
 
-from lpbuildd.slave import BuilderStatus
+from lpbuildd.builder import BuilderStatus
 from six.moves import xmlrpc_client
 from testtools.matchers import ContainsAll
 from testtools.testcase import ExpectedException
diff --git a/scripts/rosetta/pottery-generate-intltool.py b/scripts/rosetta/pottery-generate-intltool.py
index 4557676..7b06056 100755
--- a/scripts/rosetta/pottery-generate-intltool.py
+++ b/scripts/rosetta/pottery-generate-intltool.py
@@ -12,7 +12,9 @@ import _pythonpath
 import os.path
 
 from lpbuildd.pottery.intltool import generate_pots
-from lpbuildd.tests.fakeslave import UncontainedBackend as _UncontainedBackend
+from lpbuildd.tests.fakebuilder import (
+    UncontainedBackend as _UncontainedBackend,
+    )
 
 from lp.services.scripts.base import LaunchpadScript