Merge lp:~stevenk/launchpad/populate-spph-pu into lp:launchpad

[Steve Kowalik]

When calling newSourcePublication() from IPackageUpload.realiseUpload() or do_copy() via means of PCJs, set packageupload.

When calling newSourcePublication() from IPackageUpload.realiseUpload(), pass in the new packageupload parameter, so that we can grab the packageupload easily after the fact.
This will also set packageupload for publications that are copied via PCJs.

This can't land until 15-0 is applied on prod and merged into devel, but I thought I'd get it reviewed first.

I have drive-by'd a text fix in ISPPH's interface (and screwed up what diff thinks what was added, sigh), as well as fixing a strange in-test import.

[Curtis Hovey (sinzui)]

Thank you.

I think 'pu' is ambiguous. Is there a better name like 'package_upload' that will make this code easier to read?

review: Approve (code)

=== modified file 'lib/lp/_schema_circular_imports.py'
--- lib/lp/_schema_circular_imports.py	2012-05-01 10:20:07 +0000
+++ lib/lp/_schema_circular_imports.py	2012-05-24 22:36:21 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009-2011 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2012 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Update the interface schema values due to circular imports.
@@ -370,6 +370,8 @@
 patch_reference_property(
     ISourcePackagePublishingHistory, 'ancestor',
     ISourcePackagePublishingHistory)
+patch_reference_property(
+    ISourcePackagePublishingHistory, 'packageupload', IPackageUpload)
 
 # IArchive apocalypse.
 patch_reference_property(IArchive, 'distribution', IDistribution)

=== modified file 'lib/lp/soyuz/interfaces/publishing.py'
--- lib/lp/soyuz/interfaces/publishing.py	2012-04-16 15:48:58 +0000
+++ lib/lp/soyuz/interfaces/publishing.py	2012-05-24 22:36:21 +0000
@@ -499,7 +499,17 @@
         Reference(
             IPerson,
             title=_('Publication sponsor'),
-            description=_('The IPerson who sponsored the creation of'
+            description=_('The IPerson who sponsored the creation of '
+                'this publication.'),
+            required=False, readonly=True
+        ))
+
+    packageupload = exported(
+        Reference(
+            # Really IPackageUpload, fixed in _schema_circular_imports.
+            Interface,
+            title=_('Package upload'),
+            description=_('The Package Upload that caused the creation of '
                 'this publication.'),
             required=False, readonly=True
         ))
@@ -637,6 +647,8 @@
             `IOverridePolicy`.
         :param creator: the `IPerson` to use as the creator for the copied
             publication.
+        :param packageupload: The `IPackageUpload` that caused this
+            publication to be created.
 
         :return: a `ISourcePackagePublishingHistory` record representing the
             source in the destination location.
@@ -1023,6 +1035,8 @@
             sourcepackagerelease's creator will be used.
         :param sponsor: An optional `IPerson` indicating the sponsor of this
             publication.
+        :param packageupload: An optional `IPackageUpload` that caused this
+            publication to be created.
 
         datecreated will be UTC_NOW.
         status will be PackagePublishingStatus.PENDING

=== modified file 'lib/lp/soyuz/model/packagecopyjob.py'
--- lib/lp/soyuz/model/packagecopyjob.py	2012-04-25 20:40:04 +0000
+++ lib/lp/soyuz/model/packagecopyjob.py	2012-05-24 22:36:21 +0000
@@ -552,7 +552,7 @@
             include_binaries=self.include_binaries, check_permissions=True,
             person=self.requester, overrides=[override],
             send_email=send_email, announce_from_person=self.requester,
-            sponsored=self.sponsored)
+            sponsored=self.sponsored, packageupload=pu)
 
         # Add a PackageDiff for this new upload if it has ancestry.
         if ancestry is not None:

=== modified file 'lib/lp/soyuz/model/publishing.py'
--- lib/lp/soyuz/model/publishing.py	2012-02-24 03:47:44 +0000
+++ lib/lp/soyuz/model/publishing.py	2012-05-24 22:36:21 +0000
@@ -457,6 +457,8 @@
     sponsor = ForeignKey(
         dbName='sponsor', foreignKey='Person',
         storm_validator=validate_public_person, notNull=False, default=None)
+    packageupload = ForeignKey(
+        dbName='packageupload', foreignKey='PackageUpload', default=None)
 
     @property
     def package_creator(self):
@@ -817,7 +819,8 @@
             archive=current.archive)
 
     def copyTo(self, distroseries, pocket, archive, override=None,
-               create_dsd_job=True, creator=None, sponsor=None):
+               create_dsd_job=True, creator=None, sponsor=None,
+               packageupload=None):
         """See `ISourcePackagePublishingHistory`."""
         component = self.component
         section = self.section
@@ -836,7 +839,8 @@
             ancestor=self,
             create_dsd_job=create_dsd_job,
             creator=creator,
-            sponsor=sponsor)
+            sponsor=sponsor,
+            packageupload=packageupload)
 
     def getStatusSummaryForBuilds(self):
         """See `ISourcePackagePublishingHistory`."""
@@ -1502,7 +1506,7 @@
     def newSourcePublication(self, archive, sourcepackagerelease,
                              distroseries, component, section, pocket,
                              ancestor=None, create_dsd_job=True,
-                             creator=None, sponsor=None):
+                             creator=None, sponsor=None, packageupload=None):
         """See `IPublishingSet`."""
         # Avoid circular import.
         from lp.registry.model.distributionsourcepackage import (
@@ -1520,7 +1524,8 @@
             datecreated=UTC_NOW,
             ancestor=ancestor,
             creator=creator,
-            sponsor=sponsor)
+            sponsor=sponsor,
+            packageupload=packageupload)
         DistributionSourcePackage.ensure(pub)
 
         if create_dsd_job:

=== modified file 'lib/lp/soyuz/model/queue.py'
--- lib/lp/soyuz/model/queue.py	2012-01-05 14:05:10 +0000
+++ lib/lp/soyuz/model/queue.py	2012-05-24 22:36:21 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009-2011 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2012 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 # pylint: disable-msg=E0611,W0212
@@ -1215,7 +1215,8 @@
             distroseries=self.packageupload.distroseries,
             component=self.sourcepackagerelease.component,
             section=self.sourcepackagerelease.section,
-            pocket=self.packageupload.pocket)
+            pocket=self.packageupload.pocket,
+            packageupload=self.packageupload)
 
 
 class PackageUploadCustom(SQLBase):

=== modified file 'lib/lp/soyuz/scripts/packagecopier.py'
--- lib/lp/soyuz/scripts/packagecopier.py	2012-02-21 22:46:28 +0000
+++ lib/lp/soyuz/scripts/packagecopier.py	2012-05-24 22:36:21 +0000
@@ -533,7 +533,7 @@
             allow_delayed_copies=True, person=None, check_permissions=True,
             overrides=None, send_email=False, strict_binaries=True,
             close_bugs=True, create_dsd_job=True,  announce_from_person=None,
-            sponsored=None):
+            sponsored=None, packageupload=None):
     """Perform the complete copy of the given sources incrementally.
 
     Verifies if each copy can be performed using `CopyChecker` and
@@ -579,7 +579,8 @@
         being sponsored for this copy. May be None, but if present will
         affect the "From:" address on notifications and the creator of the
         publishing record will be set to this person.
-
+    :param packageupload: The `IPackageUpload` that caused this publication
+        to be created.
 
     :raise CannotCopy when one or more copies were not allowed. The error
         will contain the reason why each copy was denied.
@@ -661,7 +662,7 @@
                 include_binaries, override, close_bugs=close_bugs,
                 create_dsd_job=create_dsd_job,
                 close_bugs_since_version=old_version, creator=creator,
-                sponsor=sponsor)
+                sponsor=sponsor, packageupload=packageupload)
             if send_email:
                 notify(
                     person, source.sourcepackagerelease, [], [], archive,
@@ -678,7 +679,7 @@
 def _do_direct_copy(source, archive, series, pocket, include_binaries,
                     override=None, close_bugs=True, create_dsd_job=True,
                     close_bugs_since_version=None, creator=None,
-                    sponsor=None):
+                    sponsor=None, packageupload=None):
     """Copy publishing records to another location.
 
     Copy each item of the given list of `SourcePackagePublishingHistory`
@@ -706,6 +707,8 @@
         for bugs to close.  See `close_bugs_for_sourcepackagerelease`.
     :param creator: the requester `IPerson`.
     :param sponsor: the sponsor `IPerson`, if this copy is being sponsored.
+    :param packageupload: The `IPackageUpload` that caused this publication
+        to be created.
 
     :return: a list of `ISourcePackagePublishingHistory` and
         `BinaryPackagePublishingHistory` corresponding to the copied
@@ -736,7 +739,7 @@
             override = overrides[0]
         source_copy = source.copyTo(
             series, pocket, archive, override, create_dsd_job=create_dsd_job,
-            creator=creator, sponsor=sponsor)
+            creator=creator, sponsor=sponsor, packageupload=packageupload)
         if close_bugs:
             close_bugs_for_sourcepublication(
                 source_copy, close_bugs_since_version)

=== modified file 'lib/lp/soyuz/stories/webservice/xx-source-package-publishing.txt'
--- lib/lp/soyuz/stories/webservice/xx-source-package-publishing.txt	2012-01-31 01:19:45 +0000
+++ lib/lp/soyuz/stories/webservice/xx-source-package-publishing.txt	2012-05-24 22:36:21 +0000
@@ -129,6 +129,7 @@
     package_creator_link: u'http://.../beta/~name16'
     package_maintainer_link: u'http://.../beta/~name16'
     package_signer_link: u'http://.../beta/~name16'
+    packageupload_link: None
     pocket: u'Release'
     removal_comment: None
     removed_by_link: None

=== modified file 'lib/lp/soyuz/tests/test_packagecopyjob.py'
--- lib/lp/soyuz/tests/test_packagecopyjob.py	2012-04-26 15:25:13 +0000
+++ lib/lp/soyuz/tests/test_packagecopyjob.py	2012-05-24 22:36:21 +0000
@@ -355,6 +355,24 @@
 
         self.assertEqual(1, naked_job.reportFailure.call_count)
 
+    def test_copy_with_packageupload(self):
+        # When a PCJ with a PackageUpload gets processed, the resulting
+        # publication is linked to the PackageUpload.
+        spn = self.factory.getUniqueString()
+        pcj = self.createCopyJob(spn, 'universe', 'web', '1.0-1', True)
+        pu = getUtility(IPackageUploadSet).getByPackageCopyJobIDs(
+            [pcj.id]).one()
+        pu.acceptFromQueue()
+        owner = pcj.target_archive.owner
+        switch_dbuser("launchpad_main")
+        with person_logged_in(owner):
+            pcj.target_archive.newComponentUploader(
+                pcj.requester, 'universe')
+        self.runJob(pcj)
+        new_publication = pcj.target_archive.getPublishedSources(
+            name=spn).one()
+        self.assertEqual(new_publication.packageupload, pu)
+
     def test_target_ppa_non_release_pocket(self):
         # When copying to a PPA archive the target must be the release pocket.
         distroseries = self.factory.makeDistroSeries()
@@ -812,7 +830,8 @@
         # UnknownOverridePolicy policy.
         self.assertEqual('universe', pcj.metadata['component_override'])
 
-    def createCopyJob(self, sourcename, component, section, version):
+    def createCopyJob(self, sourcename, component, section, version,
+                      return_job=False):
         # Helper method to create a package copy job for a package with
         # the given sourcename, component, section and version.
         publisher = SoyuzTestPublisher()
@@ -846,6 +865,9 @@
 
         # Run the job so it gains a PackageUpload.
         self.assertRaises(SuspendJobException, self.runJob, job)
+        job.suspend()
+        if return_job:
+            return job
         pcj = removeSecurityProxy(job).context
         return pcj
 

=== modified file 'lib/lp/soyuz/tests/test_packageupload.py'
--- lib/lp/soyuz/tests/test_packageupload.py	2012-01-20 15:42:44 +0000
+++ lib/lp/soyuz/tests/test_packageupload.py	2012-05-24 22:36:21 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009-2011 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2012 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Test Build features."""
@@ -35,6 +35,7 @@
     QueueInconsistentStateError,
     )
 from lp.soyuz.interfaces.section import ISectionSet
+from lp.soyuz.model.packagecopyjob import IPackageCopyJobSource
 from lp.soyuz.tests.test_publishing import SoyuzTestPublisher
 from lp.testing import TestCaseWithFactory
 from lp.testing.dbuser import switch_dbuser
@@ -363,6 +364,16 @@
         self.assertEqual(spr.sourcepackagename.name, upload.package_name)
         self.assertEqual(spr.version, upload.package_version)
 
+    def test_publish_sets_packageupload(self):
+        # Publishing a PackageUploadSource will pass itself to the source
+        # publication that was created.
+        upload = self.factory.makeSourcePackageUpload()
+        self.factory.makeComponentSelection(
+            upload.distroseries, upload.sourcepackagerelease.component)
+        upload.setAccepted()
+        [spph] = upload.realiseUpload()
+        self.assertEqual(spph.packageupload, upload)
+
 
 class TestPackageUploadWithPackageCopyJob(TestCaseWithFactory):
 
@@ -371,7 +382,6 @@
 
     def makeUploadWithPackageCopyJob(self, sourcepackagename=None):
         """Create a `PackageUpload` plus attached `PlainPackageCopyJob`."""
-        from lp.soyuz.model.packagecopyjob import IPackageCopyJobSource
         upload = self.factory.makeCopyJobPackageUpload(
             sourcepackagename=sourcepackagename)
         return upload, getUtility(IPackageCopyJobSource).wrap(