Merge lp:~al-maisan/launchpad/parc-456551 into lp:launchpad/db-devel

[Muharem Hrnjadovic]

[Muharem Hrnjadovic (al-maisan)]

Hello there!

The branch at hand fixes bug #456551.

When a source package upload (to the partner archive) lacks the orig.tar.gz
file we should look for it in the Ubuntu main archive *and* in the partner
archive.

Previously we were looking for missing files in the Ubuntu *main* archive
only.

Pre-implementation call with Julian E.

Tests to run:

    bin/test -vv -t upload

[Julian Edwards (julian-edwards)]

Nice branch Muharem, let's land it when 3.1.11 opens. Thanks!

review: Approve (code)

=== modified file 'lib/lp/archiveuploader/dscfile.py'
--- lib/lp/archiveuploader/dscfile.py	2009-06-24 23:33:29 +0000
+++ lib/lp/archiveuploader/dscfile.py	2009-11-05 20:23:11 +0000
@@ -34,7 +34,7 @@
     re_valid_pkg_name, re_valid_version, re_issource)
 from canonical.encoding import guess as guess_encoding
 from lp.registry.interfaces.person import IPersonSet, PersonCreationRationale
-from lp.soyuz.interfaces.archive import ArchivePurpose
+from lp.soyuz.interfaces.archive import ArchivePurpose, IArchiveSet
 from canonical.launchpad.interfaces import (
     GPGVerificationError, IGPGHandler, IGPGKeySet,
     ISourcePackageNameSet, NotFoundError)
@@ -323,7 +323,17 @@
 
         :raise: `NotFoundError` when the wanted file could not be found.
         """
-        if (self.policy.archive.purpose == ArchivePurpose.PPA and
+        # We cannot check the archive purpose for partner archives here,
+        # because the archive override rules have not been applied yet.
+        # Uploads destined for the Ubuntu main archive and the 'partner'
+        # component will eventually end up in the partner archive though.
+        if (self.policy.archive.purpose == ArchivePurpose.PRIMARY and
+            self.component_name == 'partner'):
+            archives = [
+                getUtility(IArchiveSet).getByDistroPurpose(
+                distribution=self.policy.distro,
+                purpose=ArchivePurpose.PARTNER)]
+        elif (self.policy.archive.purpose == ArchivePurpose.PPA and
             filename.endswith('.orig.tar.gz')):
             archives = [self.policy.archive, self.policy.distro.main_archive]
         else:
 
=== added directory 'lib/lp/archiveuploader/tests/data/suite/foocomm_1.0-3'
=== added file 'lib/lp/archiveuploader/tests/data/suite/foocomm_1.0-3/foocomm_1.0-3.diff.gz'
 Binary files lib/lp/archiveuploader/tests/data/suite/foocomm_1.0-3/foocomm_1.0-3.diff.gz	1970-01-01 00:00:00 +0000 and lib/lp/archiveuploader/tests/data/suite/foocomm_1.0-3/foocomm_1.0-3.diff.gz	2009-11-05 20:23:11 +0000 differ
=== added file 'lib/lp/archiveuploader/tests/data/suite/foocomm_1.0-3/foocomm_1.0-3.dsc'
--- lib/lp/archiveuploader/tests/data/suite/foocomm_1.0-3/foocomm_1.0-3.dsc	1970-01-01 00:00:00 +0000
+++ lib/lp/archiveuploader/tests/data/suite/foocomm_1.0-3/foocomm_1.0-3.dsc	2009-11-05 20:23:11 +0000
@@ -0,0 +1,10 @@
+Format: 1.0
+Source: foocomm
+Version: 1.0-3
+Binary: foocomm
+Maintainer: Launchpad team <[e-mail]>
+Architecture: any
+Standards-Version: 3.6.2
+Files: 
+ ad436f97a58df5b233209857439f1e7c 171 foocomm_1.0.orig.tar.gz
+ e03c530973064ebbbde9226e03868cb1 595 foocomm_1.0-3.diff.gz
 
=== added file 'lib/lp/archiveuploader/tests/data/suite/foocomm_1.0-3/foocomm_1.0-3_source.changes'
--- lib/lp/archiveuploader/tests/data/suite/foocomm_1.0-3/foocomm_1.0-3_source.changes	1970-01-01 00:00:00 +0000
+++ lib/lp/archiveuploader/tests/data/suite/foocomm_1.0-3/foocomm_1.0-3_source.changes	2009-11-05 20:23:11 +0000
@@ -0,0 +1,27 @@
+Format: 1.7
+Date: Thu, 27 Feb 2006 15:34:09 +0000
+Source: foocomm
+Binary: foocomm
+Architecture: source
+Version: 1.0-3
+Distribution: breezy
+Urgency: low
+Maintainer: Launchpad team <[e-mail]>
+Changed-By: Foo Bar <[e-mail]>
+Description: 
+ foocomm        - Stuff for testing
+Changes: 
+ foocomm (1.0-1) breezy; urgency=low
+ .
+   * Initial version
+ .
+ foocomm (1.0-2) breezy; urgency=low
+ .
+   * Version 2 testing
+ .
+ foocomm (1.0-3) breezy; urgency=low
+ .
+   * Version 3 testing, orig.tar.gz reuse from partner archive.
+Files: 
+ 5885c292c1f4a3611a6506e4fa4e80a8 291 partner/devel optional foocomm_1.0-3.dsc
+ e03c530973064ebbbde9226e03868cb1 595 partner/devel optional foocomm_1.0-3.diff.gz
 
=== modified file 'lib/lp/archiveuploader/tests/test_ppauploadprocessor.py'
--- lib/lp/archiveuploader/tests/test_ppauploadprocessor.py	2009-08-28 07:34:44 +0000
+++ lib/lp/archiveuploader/tests/test_ppauploadprocessor.py	2009-11-05 20:23:11 +0000
@@ -946,6 +946,7 @@
         except NotFoundError:
             self.fail('bar_1.0.orig.tar.gz is not yet published.')
 
+        # Please note: this upload goes to the Ubuntu main archive.
         upload_dir = self.queueUpload("bar_1.0-10")
         self.processUpload(self.uploadprocessor, upload_dir)
         # Discard the announcement email and check the acceptance message
@@ -961,6 +962,7 @@
         # Make the official bar orig.tar.gz available in the system.
         self.uploadNewBarToUbuntu()
 
+        # Please note: the upload goes to the PPA.
         # Upload a higher version of 'bar' to a PPA that relies on the
         # availability of orig.tar.gz published in ubuntu.
         upload_dir = self.queueUpload("bar_1.0-10", "~name16/ubuntu")
@@ -1032,6 +1034,7 @@
         # Make the official bar orig.tar.gz available in the system.
         self.uploadNewBarToUbuntu()
 
+        # Please note: the upload goes to the PPA.
         # Upload a higher version of 'bar' to a PPA that relies on the
         # availability of orig.tar.gz published in the PPA itself.
         upload_dir = self.queueUpload("bar_1.0-10-ppa-orig", "~name16/ubuntu")
 
=== modified file 'lib/lp/archiveuploader/tests/test_uploadprocessor.py'
--- lib/lp/archiveuploader/tests/test_uploadprocessor.py	2009-09-04 08:35:20 +0000
+++ lib/lp/archiveuploader/tests/test_uploadprocessor.py	2009-11-05 20:23:11 +0000
@@ -742,6 +742,53 @@
             "Expected email containing 'Cannot mix partner files with "
             "non-partner.', got:\n%s" % raw_msg)
 
+    def testPartnerReusingOrigFromPartner(self):
+        """Partner uploads reuse 'orig.tar.gz' from the partner archive."""
+        # Make the official bar orig.tar.gz available in the system.
+        uploadprocessor = self.setupBreezyAndGetUploadProcessor(
+            policy='absolutely-anything')
+
+        upload_dir = self.queueUpload("foocomm_1.0-1")
+        self.processUpload(uploadprocessor, upload_dir)
+
+        self.assertEqual(
+            uploadprocessor.last_processed_upload.queue_root.status,
+            PackageUploadStatus.NEW)
+
+        [queue_item] = self.breezy.getQueueItems(
+            status=PackageUploadStatus.NEW, name="foocomm",
+            version="1.0-1", exact_match=True)
+        queue_item.setAccepted()
+        queue_item.realiseUpload()
+        self.layer.commit()
+
+        archive = getUtility(IArchiveSet).getByDistroPurpose(
+            distribution=self.ubuntu, purpose=ArchivePurpose.PARTNER)
+        try:
+            self.ubuntu.getFileByName(
+                'foocomm_1.0.orig.tar.gz', archive=archive, source=True,
+                binary=False)
+        except NotFoundError:
+            self.fail('foocomm_1.0.orig.tar.gz is not yet published.')
+
+        # Please note: this upload goes to the Ubuntu main archive.
+        upload_dir = self.queueUpload("foocomm_1.0-3")
+        self.processUpload(uploadprocessor, upload_dir)
+        # Discard the announcement email and check the acceptance message
+        # content.
+        from_addr, to_addrs, raw_msg = stub.test_emails.pop()
+        msg = message_from_string(raw_msg)
+        # This is now a MIMEMultipart message.
+        body = msg.get_payload(0)
+        body = body.get_payload(decode=True)
+
+        self.assertEqual(
+            '[ubuntu/breezy] foocomm 1.0-3 (Accepted)', msg['Subject'])
+        self.assertFalse(
+            'Unable to find foocomm_1.0.orig.tar.gz in upload or '
+            'distribution.' in body,
+            'Unable to find foocomm_1.0.orig.tar.gz')
+
     def testPartnerUpload(self):
         """Partner packages should be uploaded to the partner archive.