Merge lp:~julian-edwards/launchpad/auto-accept-copy-archive-binaries-bug-520520 into lp:launchpad

[Julian Edwards]

[Julian Edwards (julian-edwards)]

= Summary =
Add copy archive binary upload overrides.

== Proposed fix ==
This is a further tweak to my previous version of this branch that auto-
accepts COPY archive binaries. We also need to make sure that the uploaded
binary gets overrides applied from the main archive - this means it has to get
the same component as the same version in the main archive.

== Pre-implementation notes ==
Thanks to wgrant for pointing this out :)

== Implementation details ==
Partial diff here in case LP doesn't work it out:
http://pastebin.ubuntu.com/384376/

== Tests ==
bin/test -cvv test_uploadprocessor

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/lp/archiveuploader/nascentupload.py
  lib/lp/archiveuploader/tests/test_uploadprocessor.py

[Abel Deuring (adeuring)]

review: Approve (code)

=== modified file 'lib/lp/archiveuploader/nascentupload.py'
--- lib/lp/archiveuploader/nascentupload.py	2010-02-26 10:59:07 +0000
+++ lib/lp/archiveuploader/nascentupload.py	2010-02-26 15:45:37 +0000
@@ -582,7 +582,10 @@
         # See the comment below, in getSourceAncestry
         lookup_pockets = [self.policy.pocket, PackagePublishingPocket.RELEASE]
 
-        if self.policy.archive.purpose not in MAIN_ARCHIVE_PURPOSES:
+        # If the archive is a main archive or a copy archive, we want to
+        # look up the ancestry in all the main archives.
+        if (self.policy.archive.purpose not in MAIN_ARCHIVE_PURPOSES and
+            not self.policy.archive.is_copy):
             archive = self.policy.archive
         else:
             archive = None
@@ -777,7 +780,11 @@
                     # fine.
                     ancestry = self.getBinaryAncestry(
                         uploaded_file, try_other_archs=False)
-                    if ancestry is not None:
+                    if (ancestry is not None and 
+                        not self.policy.archive.is_copy):
+                        # Ignore version checks for copy archives
+                        # because the ancestry comes from the primary
+                        # which may have changed since the copy.
                         self.checkBinaryVersion(uploaded_file, ancestry)
                 else:
                     self.logger.debug(
 
=== modified file 'lib/lp/archiveuploader/tests/test_uploadprocessor.py'
--- lib/lp/archiveuploader/tests/test_uploadprocessor.py	2010-02-26 10:59:07 +0000
+++ lib/lp/archiveuploader/tests/test_uploadprocessor.py	2010-02-26 15:45:37 +0000
@@ -548,6 +548,22 @@
             name="bar")
         queue_item.setDone()
 
+        # Upload and accept a binary for the primary archive source.
+        shutil.rmtree(upload_dir)
+        self.options.context = 'buildd'
+        self.options.buildid = bar_original_build.id
+        self.layer.txn.commit()
+        upload_dir = self.queueUpload("bar_1.0-1_binary")
+        self.processUpload(uploadprocessor, upload_dir)
+        self.assertEqual(
+            uploadprocessor.last_processed_upload.is_rejected, False)
+        bar_bin_pubs = self._publishPackage('bar', '1.0-1', source=False)
+        # Mangle its publishing component to "restricted" so we can check
+        # the copy archive ancestry override later.
+        restricted = getUtility(IComponentSet)["restricted"]
+        for pub in bar_bin_pubs:
+            pub.secure_record.component = restricted
+
         # Create a COPY archive for building in non-virtual builds.
         uploader = getUtility(IPersonSet).getByName('name16')
         copy_archive = getUtility(IArchiveSet).new(
@@ -586,6 +602,12 @@
             queue_items.count(), 1,
             "Binary upload was not accepted when it should have been.")
 
+        # The copy archive binary published component should have been
+        # inherited from the main archive's.
+        copy_bin_pubs = queue_items[0].realiseUpload()
+        for pub in copy_bin_pubs:
+            self.assertEqual(pub.component.name, restricted.name)
+
     def testCopyArchiveUploadToCurrentDistro(self):
         """Check binary copy archive uploads to RELEASE pockets.