Merge lp:~michael.nelson/launchpad/494391-ugly-upload-error-message into lp:launchpad

[Michael Nelson]

Ensure that uploads to invalid pockets are reported correctly in the rejection email.

[Michael Nelson (michael.nelson)]

This fix for this branch actually landed with:

https://code.edge.launchpad.net/~michael.nelson/launchpad/create-source-recipe-build2/+merge/18535

as part of a cleanup (see lines 16-33 of the MP diff), but wasn't tested.

This branch just adds a test to ensure the exception is correctly printed in the email (as per bug 494391).

Small drive-by removing some redundant test-code and old lint.

[Henning Eggers (henninge)]

Thanks you for your branch.

Please find another way to word the comment on the test, as these should never state the obvious "Test that ...", "Ensure that ..." etc. Simply "Uploads to the wrong pocket are rejected." is enough. Also, I found it's customary not to use docstrings ("""....""") but comments (# ...) here.

review: Approve (code)

=== modified file 'lib/lp/archiveuploader/tests/test_permission.py'
--- lib/lp/archiveuploader/tests/test_permission.py	2010-02-02 14:01:02 +0000
+++ lib/lp/archiveuploader/tests/test_permission.py	2010-02-08 13:51:22 +0000
@@ -62,8 +62,6 @@
         """Assert that 'person' can upload 'spn' to 'archive'."""
         # For now, just check that doesn't raise an exception.
         if distroseries is None:
-            distroseries = archive.distribution.currentseries
-        if distroseries is None:
             distroseries = self.factory.makeDistroSeries(
                 distribution=archive.distribution)
         pocket = PackagePublishingPocket.RELEASE
@@ -87,8 +85,6 @@
         :param distroseries: The upload's target distro series.
         """
         if distroseries is None:
-            distroseries = archive.distribution.currentseries
-        if distroseries is None:
             distroseries = self.factory.makeDistroSeries()
         pocket = PackagePublishingPocket.RELEASE
         exception = check_upload_to_archive(

=== modified file 'lib/lp/archiveuploader/tests/test_uploadprocessor.py'
--- lib/lp/archiveuploader/tests/test_uploadprocessor.py	2010-01-20 15:41:25 +0000
+++ lib/lp/archiveuploader/tests/test_uploadprocessor.py	2010-02-08 13:51:22 +0000
@@ -26,6 +26,7 @@
 from lp.archiveuploader.uploadprocessor import UploadProcessor
 from canonical.config import config
 from canonical.database.constants import UTC_NOW
+from canonical.launchpad.webapp.interfaces import NotFoundError
 from lp.soyuz.model.archivepermission import ArchivePermission
 from lp.soyuz.model.binarypackagename import BinaryPackageName
 from lp.soyuz.model.binarypackagerelease import (
@@ -1621,6 +1622,38 @@
             in raw_msg,
             "Source was not rejected properly:\n%s" % raw_msg)
 
+    def testUploadToWrongPocketIsRejected(self):
+        # Uploads to the wrong pocket are rejected.
+        self.setupBreezy()
+        breezy = self.ubuntu['breezy']
+        breezy.status = SeriesStatus.CURRENT
+        uploadprocessor = UploadProcessor(
+            self.options, self.layer.txn, self.log)
+
+        upload_dir = self.queueUpload("bar_1.0-1")
+        self.processUpload(uploadprocessor, upload_dir)
+        rejection_message = (
+            uploadprocessor.last_processed_upload.rejection_message)
+        self.assertEqual(
+            "Not permitted to upload to the RELEASE pocket in a series in "
+            "the 'CURRENT' state.",
+            rejection_message)
+
+        contents = [
+            "Subject: bar_1.0-1_source.changes rejected",
+            "Not permitted to upload to the RELEASE pocket in a series "
+            "in the 'CURRENT' state.",
+            "If you don't understand why your files were rejected",
+            "http://answers.launchpad.net/soyuz",
+            "You are receiving this email because you are the "
+               "uploader, maintainer or",
+            "signer of the above package.",
+            ]
+        recipients = [
+            'Foo Bar <[e-mail]>',
+            'Daniel Silverstone <[e-mail]>',
+            ]
+        self.assertEmail(contents, recipients=recipients)
 
 def test_suite():
     return unittest.TestLoader().loadTestsFromName(__name__)