Merge lp:~rvb/launchpad/queue-bug-830983 into lp:launchpad

[Raphaël Badin]

[r=henninge][bug=830983] Fix how we check for builds in lib/lp/soyuz/model/queue.py getBuildsForSources to only check inside the given distroseries.

This branch fixes how we check for builds in lib/lp/soyuz/model/queue.py getBuildsForSources to only check inside the given distroseries.

= Tests =

./bin/test -vvc test_initialize_distroseries test_check_success_with_build_in_other_series

= QA =

I'll land this with no-qa because the QA for this will be part of the QA in progress for 820452.

[Henning Eggers (henninge)]

As discussed on IRC, please be explicit about the fact that you are testing for the absence of Exception being raised. No need for fake "return True" and "assertTrue".

review: Approve

=== modified file 'lib/lp/registry/interfaces/distroseries.py'
--- lib/lp/registry/interfaces/distroseries.py	2011-08-18 03:55:10 +0000
+++ lib/lp/registry/interfaces/distroseries.py	2011-08-22 16:27:32 +0000
@@ -990,9 +990,9 @@
         )
     @call_with(user=REQUEST_USER)
     @export_write_operation()
-    def initDerivedDistroSeries(user, parents, architectures,
-                                packagesets, rebuild, overlays,
-                                overlay_pockets, overlay_components):
+    def initDerivedDistroSeries(user, parents, architectures=[],
+                                packagesets=[], rebuild=False, overlays=[],
+                                overlay_pockets=[], overlay_components=[]):
         """Initialize this series from parents.
 
         This method performs checks and then creates a job to populate

=== modified file 'lib/lp/soyuz/model/queue.py'
--- lib/lp/soyuz/model/queue.py	2011-08-16 16:11:16 +0000
+++ lib/lp/soyuz/model/queue.py	2011-08-22 16:27:32 +0000
@@ -1446,13 +1446,12 @@
                             names=None):
         """See `IPackageUploadSet`."""
         # Avoiding circular imports.
-        from lp.registry.model.distroseries import DistroSeries
         from lp.soyuz.model.binarypackagebuild import BinaryPackageBuild
         from lp.soyuz.model.sourcepackagerelease import SourcePackageRelease
 
         archives = distroseries.distribution.getArchiveIDList()
         clauses = [
-            DistroSeries.id == PackageUpload.distroseriesID,
+            PackageUpload.distroseries == distroseries,
             PackageUpload.archiveID.is_in(archives),
             PackageUploadBuild.packageuploadID == PackageUpload.id,
             ]

=== modified file 'lib/lp/soyuz/scripts/initialize_distroseries.py'
--- lib/lp/soyuz/scripts/initialize_distroseries.py	2011-08-19 12:03:39 +0000
+++ lib/lp/soyuz/scripts/initialize_distroseries.py	2011-08-22 16:27:32 +0000
@@ -160,7 +160,6 @@
                 self._checkBuilds(parent)
             self._checkQueue(parent)
         self._checkSeries()
-        return True
 
     def _checkParents(self):
         """If self.first_derivation, the parents list cannot be empty."""

=== modified file 'lib/lp/soyuz/scripts/tests/test_initialize_distroseries.py'
--- lib/lp/soyuz/scripts/tests/test_initialize_distroseries.py	2011-08-22 16:27:31 +0000
+++ lib/lp/soyuz/scripts/tests/test_initialize_distroseries.py	2011-08-22 16:27:32 +0000
@@ -243,7 +243,8 @@
             child = self.factory.makeDistroSeries(
                 distribution=self.parent.parent, previous_series=self.parent)
             ids = InitializeDistroSeries(child, [self.parent.id])
-            self.assertTrue(ids.check())
+            # No exception should be raised.
+            ids.check()
 
     def test_failure_with_pending_builds_specific_arches(self):
         # We only check for pending builds of the same architectures we're
@@ -265,6 +266,23 @@
              "see help text for more information."),
             ids.check)
 
+    def test_check_success_with_build_in_other_series(self):
+        # Builds in the child's archive but in another series do not
+        # prevent the initialization of child.
+        parent, unused = self.setupParent()
+        other_series, unused = self.setupParent(
+            distribution=parent.distribution)
+        upload = other_series.createQueueEntry(
+            PackagePublishingPocket.RELEASE,
+            other_series.main_archive, 'foo.changes', 'bar')
+        # Create a binary package upload for this upload.
+        upload.addBuild(self.factory.makeBinaryPackageBuild())
+        child = self.factory.makeDistroSeries()
+        ids = InitializeDistroSeries(child, [parent.id])
+
+        # No exception should be raised.
+        ids.check()
+
     def test_check_success_with_pending_builds_in_other_arches(self):
         # We only check for pending builds of the same architectures we're
         # copying over from the parents. If *no* build is present in the
@@ -281,7 +299,7 @@
 
         # No error is raised because we're initializing only the architecture
         # which has no pending builds in it.
-        self.assertTrue(ids.check())
+        ids.check()
 
     def test_failure_if_build_present_in_selected_packagesets(self):
         # Pending builds in a parent for source packages included in the
@@ -317,7 +335,8 @@
         ids = InitializeDistroSeries(
             child, packagesets=(str(packageset2.id),))
 
-        self.assertTrue(ids.check())
+        # No exception should be raised.
+        ids.check()
 
     def test_success_with_updates_packages(self):
         # Initialization copies all the package from the UPDATES pocket.
@@ -395,7 +414,8 @@
             child = self.factory.makeDistroSeries()
             ids = InitializeDistroSeries(child, [parent.id])
 
-            self.assertTrue(ids.check())
+            # No exception should be raised.
+            ids.check()
 
     def test_failure_with_binary_queue_items_pockets(self):
         # If the parent series has binary items in pockets RELEASE,
@@ -465,7 +485,8 @@
             child = self.factory.makeDistroSeries()
             ids = InitializeDistroSeries(child, [parent.id])
 
-            self.assertTrue(ids.check())
+            # No exception should be raised.
+            ids.check()
 
     def test_check_success_with_source_queue_items(self):
         # If the parent series has *source* items in its queues, we
@@ -479,7 +500,8 @@
         child = self.factory.makeDistroSeries()
         ids = InitializeDistroSeries(child, [parent.id])
 
-        self.assertTrue(ids.check())
+        # No exception should be raised.
+        ids.check()
 
     def test_check_success_with_binary_queue_items_outside_packagesets(self):
         # If the parent series has binary items in its queues not in the
@@ -504,7 +526,8 @@
         ids = InitializeDistroSeries(child, [parent.id],
             child, packagesets=(str(packageset1.id),))
 
-        self.assertTrue(ids.check())
+        # No exception should be raised.
+        ids.check()
 
     def test_failure_with_binary_queue_items_in_packagesets(self):
         # If the parent series has binary items in its queues in the