launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging lp:~cjwatson/launchpad/buildmaster-test-modern-buildd into lp:launchpad.

Commit message:
Fix buildmaster tests to tolerate running with python-lpbuildd >= 126.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/buildmaster-test-modern-buildd/+merge/270292

Fix buildmaster tests to tolerate running with python-lpbuildd >= 126.

I believe that the buildbot slaves currently have 121, which is easily new enough for this kind of thing.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/launchpad/buildmaster-test-modern-buildd into lp:launchpad.

=== modified file 'lib/lp/buildmaster/tests/mock_slaves.py'
--- lib/lp/buildmaster/tests/mock_slaves.py	2014-06-26 07:39:03 +0000
+++ lib/lp/buildmaster/tests/mock_slaves.py	2015-09-07 11:31:43 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009-2014 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2015 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Mock Build objects for tests soyuz buildd-system."""
@@ -120,7 +120,7 @@
 
     def info(self):
         self.call_log.append('info')
-        return defer.succeed(('1.0', self.arch_tag, 'debian'))
+        return defer.succeed(('1.0', self.arch_tag, 'binarypackage'))
 
     def resume(self):
         self.call_log.append('resume')
@@ -330,6 +330,11 @@
         dsc_file = 'thing'
         self.makeCacheFile(tachandler, chroot_file)
         self.makeCacheFile(tachandler, dsc_file)
+        extra_args = {
+            'distribution': 'ubuntu',
+            'suite': 'precise',
+            'ogrecomponent': 'main',
+            }
         return slave.build(
-            build_id, 'debian', chroot_file, {'.dsc': dsc_file},
-            {'ogrecomponent': 'main'})
+            build_id, 'binarypackage', chroot_file, {'.dsc': dsc_file},
+            extra_args)

=== modified file 'lib/lp/buildmaster/tests/test_interactor.py'
--- lib/lp/buildmaster/tests/test_interactor.py	2014-06-26 07:17:13 +0000
+++ lib/lp/buildmaster/tests/test_interactor.py	2015-09-07 11:31:43 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009-2014 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2015 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Test BuilderInteractor features."""
@@ -509,9 +509,11 @@
         self.assertEqual(['1.0', 'i386'], info[:2])
         self.assertThat(
             info[2],
+            # XXX cjwatson 2015-09-07: This should also include 'snap' once
+            # the buildbot slaves are upgraded to python-lpbuildd >= 133.
             ContainsAll(
                 ('sourcepackagerecipe', 'translation-templates',
-                 'binarypackage', 'debian')))
+                 'binarypackage', 'livefs')))
 
     @defer.inlineCallbacks
     def test_initial_status(self):