Merge lp:~rvb/launchpad/perm-845803 into lp:launchpad

[Raphaël Badin]

[r=julian-edwards][bug=845803] Remove call to canSetEnabledRestrictedFamilies

This branch fixes a regression introduced by a bad merge which left a call to a removed method (!): canSetEnabledRestrictedFamilies. This was not picked up by our test suite because this happened in a part of the code that was not covered by tests. This branch fixes this and adds a proper test for this.

= Tests =

./bin/test -vvc test_archive_admin_view test_cannot_change_enabled_restricted_families

= QA =

Edit a ppa archive (https://launchpad.dev/~me/+archive/ppa/+admin) and change the values of "Require virtualized builders" and "Enabled restricted families". "Enabled restricted families" should only be modifiable if "Require virtualized builders" is True.

[Julian Edwards (julian-edwards)]

review: Approve

=== modified file 'lib/lp/soyuz/browser/archive.py'
--- lib/lp/soyuz/browser/archive.py	2011-09-06 15:00:37 +0000
+++ lib/lp/soyuz/browser/archive.py	2011-09-12 13:59:50 +0000
@@ -2066,6 +2066,12 @@
             self.setFieldError('require_virtualized', error_msg)
 
 
+ARCHIVE_ENABLED_RESTRICTED_FAMILITES_ERROR_MSG = (
+    u'Main archives can not be restricted to certain '
+    'architectures unless they are set to build on '
+    'virtualized builders.')
+
+
 class ArchiveAdminView(BaseArchiveEditView, EnableRestrictedFamiliesMixin):
 
     field_names = ['enabled', 'private', 'commercial', 'require_virtualized',
@@ -2131,14 +2137,18 @@
                 'Can only set commericial for private archives.')
 
         enabled_restricted_families = data.get('enabled_restricted_families')
-        if (enabled_restricted_families and
-            not self.context.canSetEnabledRestrictedFamilies(
-                enabled_restricted_families)):
+        require_virtualized = data.get('require_virtualized')
+        proc_family_set = getUtility(IProcessorFamilySet)
+        if (enabled_restricted_families is not None and
+            not require_virtualized and
+            set(enabled_restricted_families) !=
+                set(proc_family_set.getRestricted())):
             self.setFieldError(
                 'enabled_restricted_families',
-                'Main archives can not be restricted to certain '
-                'architectures unless they are set to build on '
-                'virtualized builders.')
+                ARCHIVE_ENABLED_RESTRICTED_FAMILITES_ERROR_MSG)
+            self.setFieldError(
+                'require_virtualized',
+                ARCHIVE_ENABLED_RESTRICTED_FAMILITES_ERROR_MSG)
 
     @property
     def owner_is_private_team(self):

=== modified file 'lib/lp/soyuz/browser/tests/test_archive_admin_view.py'
--- lib/lp/soyuz/browser/tests/test_archive_admin_view.py	2010-10-04 19:50:45 +0000
+++ lib/lp/soyuz/browser/tests/test_archive_admin_view.py	2011-09-12 13:59:50 +0000
@@ -71,7 +71,7 @@
         self.assertFalse(view.context.private)
 
     def test_set_private_without_buildd_secret(self):
-        """If a PPA is marked private but no buildd secret is specified, 
+        """If a PPA is marked private but no buildd secret is specified,
         one will be generated."""
         view = self.initialize_admin_view(private=True, buildd_secret='')
         self.assertEqual(0, len(view.errors))
@@ -101,3 +101,29 @@
             'This archive already has published sources. '
             'It is not possible to switch the privacy.',
             view.errors[0])
+
+    def test_cannot_change_enabled_restricted_families(self):
+        # If require_virtualized is False, enabled_restricted_families
+        # cannot be changed.
+        method = 'POST'
+        form = {
+            'field.enabled': 'on',
+            'field.require_virtualized': '',
+            'field.enabled_restricted_families': [],
+            'field.actions.save': 'Save',
+            }
+
+        view = ArchiveAdminView(self.ppa, LaunchpadTestRequest(
+            method=method, form=form))
+        view.initialize()
+
+        error_msg = (
+            u'Main archives can not be restricted to certain '
+            'architectures unless they are set to build on '
+            'virtualized builders.')
+        self.assertEqual(
+           error_msg,
+           view.widget_errors.get('enabled_restricted_families'))
+        self.assertEqual(
+           error_msg,
+           view.widget_errors.get('require_virtualized'))

=== modified file 'lib/lp/soyuz/stories/ppa/xx-ppa-workflow.txt'
--- lib/lp/soyuz/stories/ppa/xx-ppa-workflow.txt	2011-01-29 00:19:18 +0000
+++ lib/lp/soyuz/stories/ppa/xx-ppa-workflow.txt	2011-09-12 13:59:50 +0000
@@ -363,7 +363,7 @@
     >>> admin_browser.getControl(name="field.commercial").value = True
     >>> admin_browser.getControl(name="field.buildd_secret").value = "secret"
     >>> admin_browser.getControl(
-    ...     name="field.require_virtualized").value = False
+    ...     name="field.require_virtualized").value = True
     >>> admin_browser.getControl(name="field.authorized_size").value = '1'
     >>> admin_browser.getControl(
     ...     name="field.relative_build_score").value = '199'