Merge lp:~julian-edwards/launchpad/init-superseded-bug-824532 into lp:launchpad

[Julian Edwards]

[r=julian-edwards][bug=824532] Don't copy superseded sources from the parent series when initializing a new distroseries.

Distroseries initialization is erroneously copying superseded sources from the parent. This branch fixes that.

[Julian Edwards (julian-edwards)]

review: Approve

=== modified file 'lib/lp/soyuz/scripts/initialize_distroseries.py'
--- lib/lp/soyuz/scripts/initialize_distroseries.py	2011-08-05 03:58:16 +0000
+++ lib/lp/soyuz/scripts/initialize_distroseries.py	2011-08-12 12:57:04 +0000
@@ -26,6 +26,7 @@
 from lp.soyuz.adapters.packagelocation import PackageLocation
 from lp.soyuz.enums import (
     ArchivePurpose,
+    PackagePublishingStatus,
     PackageUploadStatus,
     )
 from lp.soyuz.interfaces.archive import (
@@ -438,6 +439,8 @@
                         PackagePublishingPocket.SECURITY)
                     sources = archive.getPublishedSources(
                         distroseries=parent, pocket=pockets_to_copy,
+                        status=(PackagePublishingStatus.PENDING,
+                                PackagePublishingStatus.PUBLISHED),
                         name=spns)
                     # XXX: rvb 2011-06-23 bug=801112: do_copy is atomic (all
                     # or none of the sources will be copied). This might

=== modified file 'lib/lp/soyuz/scripts/tests/test_initialize_distroseries.py'
--- lib/lp/soyuz/scripts/tests/test_initialize_distroseries.py	2011-08-09 08:28:56 +0000
+++ lib/lp/soyuz/scripts/tests/test_initialize_distroseries.py	2011-08-12 12:57:04 +0000
@@ -203,6 +203,37 @@
         self.assertDistroSeriesInitializedCorrectly(
             child, self.parent, self.parent_das)
 
+    def test_do_not_copy_superseded_sources(self):
+        # Make sure we don't copy superseded sources from the parent,
+        # we only want (pending, published).
+        self.parent, self.parent_das = self.setupParent()
+        # Add 2 more sources, pending and superseded.
+        superseded = self.factory.makeSourcePackagePublishingHistory(
+            distroseries=self.parent,
+            pocket=PackagePublishingPocket.RELEASE,
+            status=PackagePublishingStatus.SUPERSEDED)
+        superseded_source_name = (
+            superseded.sourcepackagerelease.sourcepackagename.name)
+        pending = self.factory.makeSourcePackagePublishingHistory(
+            distroseries=self.parent,
+            pocket=PackagePublishingPocket.RELEASE,
+            status=PackagePublishingStatus.PENDING)
+        pending_source_name = (
+            pending.sourcepackagerelease.sourcepackagename.name)
+        child = self._fullInitialize([self.parent])
+
+        # Check the superseded source is not copied.
+        superseded_child_sources = child.main_archive.getPublishedSources(
+            name=superseded_source_name, distroseries=child,
+            exact_match=True)
+        self.assertEqual(0, superseded_child_sources.count())
+
+        # Check the pending source is copied.
+        pending_child_sources = child.main_archive.getPublishedSources(
+            name=pending_source_name, distroseries=child,
+            exact_match=True)
+        self.assertEqual(1, pending_child_sources.count())
+
     def test_failure_with_queue_items(self):
         # If the parent series has items in its queues, such as NEW and
         # UNAPPROVED, we can't initialize.