Merge lp:~stevenk/launchpad/deal-with-no-authorized_size into lp:launchpad

[Steve Kowalik]

Correctly deal with Archives that have a NULL authorized_size during policySpecificChecks, and now check all archives for quota.

Correctly deal with Archives that have a NULL authorized_size during policySpecificChecks for PPA uploads and on Archive:+repository_size. Also check every archive for quota now that we do handle NULL authorized_size correctly.

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'lib/lp/archiveuploader/tests/test_ppauploadprocessor.py'
--- lib/lp/archiveuploader/tests/test_ppauploadprocessor.py	2012-06-26 16:50:00 +0000
+++ lib/lp/archiveuploader/tests/test_ppauploadprocessor.py	2012-09-13 05:02:21 +0000
@@ -1250,6 +1250,17 @@
             "if you need more space."]
         self.assertEmail(contents)
 
+    def testPPASizeNoQuota(self):
+        self.name16.archive.authorized_size = None
+        upload_dir = self.queueUpload("bar_1.0-1", "~name16/ubuntu")
+        self.processUpload(self.uploadprocessor, upload_dir)
+        contents = [
+            "Subject: [PPA name16] [ubuntu/breezy] bar 1.0-1 (Accepted)"]
+        self.assertEmail(contents)
+        self.assertEqual(
+            self.uploadprocessor.last_processed_upload.queue_root.status,
+            PackageUploadStatus.DONE)
+
     def testPPASizeQuotaSourceWarning(self):
         """Verify the size quota warning for PPA near size limit.
 

=== modified file 'lib/lp/archiveuploader/uploadpolicy.py'
--- lib/lp/archiveuploader/uploadpolicy.py	2012-08-22 17:06:08 +0000
+++ lib/lp/archiveuploader/uploadpolicy.py	2012-09-13 05:02:21 +0000
@@ -212,8 +212,8 @@
         size quota.Binary upload will be skipped to avoid unnecessary hassle
         dealing with FAILEDTOUPLOAD builds.
         """
-        # Skip the check for binary uploads.
-        if upload.binaryful:
+        # Skip the check for binary uploads or archives with no quota.
+        if upload.binaryful or self.archive.authorized_size is None:
             return
 
         # Calculate the incoming upload total size.
@@ -247,18 +247,15 @@
     def policySpecificChecks(self, upload):
         """The insecure policy does not allow SECURITY uploads for now.
 
-        If the upload is targeted to any PPA, checks if the upload is within
-        the allowed quota.
+        Also check if the upload is within the allowed quota.
         """
-        if upload.is_ppa:
-            self.checkArchiveSizeQuota(upload)
-        else:
-            # XXX cjwatson 2012-07-20 bug=1026665: For now, direct uploads
-            # to SECURITY will not be built.  See
-            # BuildPackageJob.postprocessCandidate.
-            if self.pocket == PackagePublishingPocket.SECURITY:
-                upload.reject(
-                    "This upload queue does not permit SECURITY uploads.")
+        self.checkArchiveSizeQuota(upload)
+        # XXX cjwatson 2012-07-20 bug=1026665: For now, direct uploads
+        # to SECURITY will not be built.  See
+        # BuildPackageJob.postprocessCandidate.
+        if self.pocket == PackagePublishingPocket.SECURITY:
+            upload.reject(
+                "This upload queue does not permit SECURITY uploads.")
 
     def autoApprove(self, upload):
         """The insecure policy auto-approves RELEASE/PROPOSED pocket stuff.

=== modified file 'lib/lp/soyuz/browser/archive.py'
--- lib/lp/soyuz/browser/archive.py	2012-08-19 00:32:32 +0000
+++ lib/lp/soyuz/browser/archive.py	2012-09-13 05:02:21 +0000
@@ -633,14 +633,17 @@
         binary_label = '%s binary %s' % (
             number_of_binaries, package_plural(number_of_binaries))
 
-        # Quota is stored in MiB, convert it to bytes.
-        quota = self.context.authorized_size * (2 ** 20)
         used = self.context.estimated_size
-
-        # Calculate the usage factor and limit it to 100%.
-        used_factor = (float(used) / quota)
-        if used_factor > 1:
-            used_factor = 1
+        if self.context.authorized_size:
+            # Quota is stored in MiB, convert it to bytes.
+            quota = self.context.authorized_size * (2 ** 20)
+            # Calculate the usage factor and limit it to 100%.
+            used_factor = (float(used) / quota)
+            if used_factor > 1:
+                used_factor = 1
+        else:
+            quota = 0
+            used_factor = 0
 
         # Calculate the appropriate CSS class to be used with the usage
         # factor. Highlight it (in red) if usage is over 90% of the quota.

=== modified file 'lib/lp/soyuz/browser/tests/archive-views.txt'
--- lib/lp/soyuz/browser/tests/archive-views.txt	2012-08-17 10:37:13 +0000
+++ lib/lp/soyuz/browser/tests/archive-views.txt	2012-09-13 05:02:21 +0000
@@ -172,6 +172,25 @@
     used_css_class:  green
     used_percentage: 0.92
 
+The authorized_size of a PPA can also be None (IE: no limit.)
+
+    >>> login('[e-mail]')
+    >>> mark.archive.authorized_size = None
+    >>> login(ANONYMOUS)
+
+    >>> mark_archive_view = create_initialized_view(
+    ...     mark.archive, name="+index")
+    >>> mark_repository_usage = mark_archive_view.repository_usage
+    >>> print_repository_usage(mark_repository_usage)
+    binaries_size:   0
+    binary_label:    1 binary package
+    quota:           0
+    source_label:    1 source package
+    sources_size:    9922683
+    used:            9924731
+    used_css_class:  green
+    used_percentage: 0.00
+
 An ArchiveView provides a batched_sources property that can be used
 to get the current batch of publishing records for an archive: