Merge lp:~julian-edwards/launchpad/delete-ppa-bug-386167 into lp:launchpad

[Julian Edwards]

= Summary =
Ensure all PPAs are deleted properly when requested. Currently there are a
load that are pending deletion but are not actually deleted, which still
blocks account renaming.

== Proposed fix ==
Make getPendingPublicationPPAs return PPAs waiting for deletion.

== Implementation details ==
IDistribution.getPendingPublicationPPAs() was only returning PPAs with
outstanding publication changes. It needs to also return PPAs awaiting
deletion so that the publisher can deal with them appropriately.

== Tests ==
bin/test -cvvt testDeletingArchive

== Demo and Q/A ==
Already QA'ed on dogfood, and it works fine.

= 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/archivepublisher/tests/test_publisher.py
  lib/lp/registry/model/distribution.py

[Graham Binns (gmb)]

review: Approve (code)

[Francis J. Lacoste (flacoste)]

review: Approve (release-critical)

=== modified file 'lib/lp/archivepublisher/tests/test_publisher.py'
--- lib/lp/archivepublisher/tests/test_publisher.py	2010-04-22 12:02:06 +0000
+++ lib/lp/archivepublisher/tests/test_publisher.py	2010-06-08 14:20:47 +0000
@@ -18,6 +18,7 @@
 from zope.component import getUtility
 from zope.security.proxy import removeSecurityProxy
 
+from canonical.zeca.ftests.harness import ZecaTestSetup
 from lp.archivepublisher.config import getPubConfig
 from lp.archivepublisher.diskpool import DiskPool
 from lp.archivepublisher.publishing import Publisher, getPublisher
@@ -37,7 +38,6 @@
 from lp.archivepublisher.interfaces.archivesigningkey import (
     IArchiveSigningKey)
 from lp.soyuz.tests.test_publishing import TestNativePublishingBase
-from canonical.zeca.ftests.harness import ZecaTestSetup
 
 
 class TestPublisherBase(TestNativePublishingBase):
@@ -437,6 +437,19 @@
         pending_archive = pending_archives[0]
         self.assertEqual(spiv.archive.id, pending_archive.id)
 
+    def testDeletingArchive(self):
+        # IArchiveSet.getPendingPPAs should return archives that have a
+        # status of DELETING.
+        ubuntu = getUtility(IDistributionSet)['ubuntu']
+
+        archive = self.factory.makeArchive()
+        old_num_pending_archives = ubuntu.getPendingPublicationPPAs().count()
+        archive.status = ArchiveStatus.DELETING
+        new_num_pending_archives = ubuntu.getPendingPublicationPPAs().count()
+        self.assertEqual(
+            1 + old_num_pending_archives, new_num_pending_archives)
+
+
     def _checkCompressedFile(self, archive_publisher, compressed_file_path,
                              uncompressed_file_path):
         """Assert that a compressed file is equal to its uncompressed version.

=== modified file 'lib/lp/registry/model/distribution.py'
--- lib/lp/registry/model/distribution.py	2010-05-27 17:20:07 +0000
+++ lib/lp/registry/model/distribution.py	2010-06-08 14:20:47 +0000
@@ -75,7 +75,7 @@
     HasTranslationImportsMixin)
 from canonical.launchpad.helpers import shortlist
 from lp.soyuz.interfaces.archive import (
-    ArchivePurpose, IArchiveSet, MAIN_ARCHIVE_PURPOSES)
+    ArchivePurpose, ArchiveStatus, IArchiveSet, MAIN_ARCHIVE_PURPOSES)
 from lp.soyuz.interfaces.archivepermission import (
     IArchivePermissionSet)
 from lp.bugs.interfaces.bugsupervisor import IHasBugSupervisor
@@ -1345,7 +1345,10 @@
             bin_query, clauseTables=['BinaryPackagePublishingHistory'],
             orderBy=['archive.id'], distinct=True)
 
-        return src_archives.union(bin_archives)
+        deleting_archives = Archive.selectBy(
+            status=ArchiveStatus.DELETING).orderBy(['archive.id'])
+
+        return src_archives.union(bin_archives).union(deleting_archives)
 
     def getArchiveByComponent(self, component_name):
         """See `IDistribution`."""