Merge lp:~ajmitch/launchpad/prerelease-backports into lp:launchpad

[Andrew Mitchell]

Also allow uploads to the backports pocket when the series status is not CURRENT or SUPPORTED

Also allow uploads to the backports pocket when the series status is not CURRENT or SUPPORTED

[Steve Kowalik (stevenk)]

This looks like great work, thanks! I'm going to approve this, but you should discuss this with Colin Watson before asking for it to be landed.

review: Approve (code)

[Colin Watson (cjwatson)]

This is fine by me - it's been discussed before and as far as I remember TB-approved.

Sorry for misleading you earlier on IRC about the need for uploadpolicy tests; I didn't realise that you wanted backports to be unapproved by default. I admit that's slightly surprising to me, but it's a reasonable decision.

review: Approve

=== modified file 'lib/lp/soyuz/model/archive.py'
--- lib/lp/soyuz/model/archive.py	2012-09-07 05:43:28 +0000
+++ lib/lp/soyuz/model/archive.py	2012-09-13 05:22:19 +0000
@@ -1267,6 +1267,7 @@
         pre_release_pockets = (
             PackagePublishingPocket.RELEASE,
             PackagePublishingPocket.PROPOSED,
+            PackagePublishingPocket.BACKPORTS,
             )
         if (pocket not in pre_release_pockets and
             distroseries.status not in stable_states):
 
=== modified file 'lib/lp/soyuz/tests/test_archive.py'
--- lib/lp/soyuz/tests/test_archive.py	2012-08-21 14:15:43 +0000
+++ lib/lp/soyuz/tests/test_archive.py	2012-09-13 05:22:19 +0000
@@ -621,6 +621,20 @@
             pocket=PackagePublishingPocket.PROPOSED,
             distroseries=distroseries)
 
+    def test_checkUpload_backports_development(self):
+        # It should be possible to upload to the BACKPORTS pocket while the
+        # distroseries is in the DEVELOPMENT status.
+        archive, distroseries = self.makeArchiveAndActiveDistroSeries(
+            purpose=ArchivePurpose.PRIMARY)
+        sourcepackagename = self.factory.makeSourcePackageName()
+        person = self.factory.makePerson()
+        removeSecurityProxy(archive).newPackageUploader(
+            person, sourcepackagename)
+        self.assertCanUpload(
+            archive, person, sourcepackagename,
+            pocket=PackagePublishingPocket.BACKPORTS,
+            distroseries=distroseries)
+
     def test_checkUpload_disabled_archive(self):
         archive, distroseries = self.makeArchiveAndActiveDistroSeries(
             purpose=ArchivePurpose.PRIMARY)