Merge lp:~jelmer/launchpad/135610-duplicated-ancestry-2 into lp:launchpad

[Jelmer Vernooij]

Allow extra PENDING source package publishing history entries in NascentUploadFile.findSourcePackageRelease.

William pointed out that the assertion I added in my branch can fail in some situations that aren't actually a problem.

When publishing new records the publisher will actually set the new record the PUBLISHED before it sets the old record to SUPERSEDED. Because of this we've decided to simply skip the assertion.

[Abel Deuring (adeuring)]

review: Approve (code)

=== modified file 'lib/lp/archiveuploader/nascentuploadfile.py'
--- lib/lp/archiveuploader/nascentuploadfile.py	2010-10-18 15:44:55 +0000
+++ lib/lp/archiveuploader/nascentuploadfile.py	2010-10-18 15:45:00 +0000
@@ -803,11 +803,6 @@
                 "Unable to find source package %s/%s in %s" % (
                 self.source_name, self.source_version, distroseries.name))
 
-        # There can only be one matching published source package.
-        published_spphs = [
-            spph for spph in spphs
-            if spph.status == PackagePublishingStatus.PUBLISHED]
-        assert len(published_spphs) <= 1, "Duplicated ancestry"
         return spphs[0].sourcepackagerelease
 
     def verifySourcePackageRelease(self, sourcepackagerelease):

=== modified file 'lib/lp/archiveuploader/tests/test_buildduploads.py'
--- lib/lp/archiveuploader/tests/test_buildduploads.py	2010-10-06 11:46:51 +0000
+++ lib/lp/archiveuploader/tests/test_buildduploads.py	2010-10-18 15:45:00 +0000
@@ -20,6 +20,7 @@
     )
 from lp.registry.interfaces.distribution import IDistributionSet
 from lp.registry.interfaces.pocket import PackagePublishingPocket
+from lp.soyuz.interfaces.publishing import IPublishingSet
 from lp.soyuz.model.binarypackagebuild import BinaryPackageBuild
 
 
@@ -195,6 +196,13 @@
         real_policy = self.policy
         self.policy = 'insecure'
         super(TestBuilddUploads, self).setUp()
+        # Publish the source package release so it can be found by
+        # NascentUploadFile.findSourcePackageRelease().
+        spr = self.source_queue.sources[0].sourcepackagerelease
+        getUtility(IPublishingSet).newSourcePublication(
+            self.distroseries.main_archive, spr,
+            self.distroseries, spr.component,
+            spr.section, PackagePublishingPocket.RELEASE)
         self.policy = real_policy
 
     def _publishBuildQueueItem(self, queue_item):

=== modified file 'lib/lp/archiveuploader/tests/test_nascentuploadfile.py'
--- lib/lp/archiveuploader/tests/test_nascentuploadfile.py	2010-10-18 15:44:55 +0000
+++ lib/lp/archiveuploader/tests/test_nascentuploadfile.py	2010-10-18 15:45:00 +0000
@@ -455,32 +455,3 @@
         uploadfile.parseControl(control)
         self.assertEquals(
             spph2.sourcepackagerelease, uploadfile.findSourcePackageRelease())
-
-    def test_findSourcePackageRelease_duplicated_ancestry(self):
-        # findSourcePackageRelease errors out if there are multiple
-        # published SourcePackageReleases, as this should never
-        # be possible.
-        das = self.factory.makeDistroArchSeries(
-            distroseries=self.policy.distroseries, architecturetag="i386")
-        build = self.factory.makeBinaryPackageBuild(
-            distroarchseries=das,
-            archive=self.policy.archive)
-        uploadfile = self.createDebBinaryUploadFile(
-            "foo_0.42_i386.deb", "main/python", "unknown", "mypkg", "0.42",
-            None)
-        spn = self.factory.makeSourcePackageName("foo")
-        spph1 = self.factory.makeSourcePackagePublishingHistory(
-            sourcepackagename=spn,
-            distroseries=self.policy.distroseries,
-            version="0.42", archive=self.policy.archive,
-            status=PackagePublishingStatus.PUBLISHED)
-        spph2 = self.factory.makeSourcePackagePublishingHistory(
-            sourcepackagename=spn,
-            distroseries=self.policy.distroseries,
-            version="0.42", archive=self.policy.archive,
-            status=PackagePublishingStatus.PUBLISHED)
-        control = self.getBaseControl()
-        control["Source"] = "foo"
-        uploadfile.parseControl(control)
-        self.assertRaises(
-            AssertionError, uploadfile.findSourcePackageRelease)