Merge lp:~julian-edwards/launchpad/sync-needs-feature-flag into lp:launchpad

[Julian Edwards]

[bug=779991] [r=julian-edwards][no-qa] Put derived distro syncs behind a feature flag as they are not quite ready for prime time.

= Summary =
Put derived distro syncs behind a feature flag as they are not quite ready for prime time.

== Tests ==
bin/test -cvv test_distroseries TestDistroSeriesLocalDifferencesFunctional

== Demo and Q/A ==

= Launchpad lint =

Checking for conflicts and issues in changed files.

Linting changed files:
  lib/lp/registry/browser/tests/test_distroseries.py
  lib/lp/services/features/flags.py
  lib/lp/registry/browser/distroseries.py

./lib/lp/registry/browser/distroseries.py
     844: E225 missing whitespace around operator
     848: E225 missing whitespace around operator
     852: E225 missing whitespace around operator
     856: E225 missing whitespace around operator
     864: E251 no spaces around keyword / parameter equals
     885: E251 no spaces around keyword / parameter equals

[Julian Edwards (julian-edwards)]

review: Approve

[Martin Pool (mbp)]

  review needsfixing

+ ('soyuz.derived-series-sync.enabled',

Those should be underscores not dashes, to be consistent with (most)
of the others.
Martin

review: Needs Fixing

=== modified file 'lib/lp/registry/browser/distroseries.py'
--- lib/lp/registry/browser/distroseries.py	2011-05-05 20:19:07 +0000
+++ lib/lp/registry/browser/distroseries.py	2011-05-09 15:52:54 +0000
@@ -804,6 +804,9 @@
         This method is used as a condition for the above sync action, as
         well as directly in the template.
         """
+        if not getFeatureFlag('soyuz.derived_series_sync.enabled'):
+            return False
+
         archive = self.context.main_archive
         has_perm = (self.user is not None and (
                         archive.hasAnyPermission(self.user) or

=== modified file 'lib/lp/registry/browser/tests/test_distroseries.py'
--- lib/lp/registry/browser/tests/test_distroseries.py	2011-05-07 16:03:41 +0000
+++ lib/lp/registry/browser/tests/test_distroseries.py	2011-05-09 15:52:54 +0000
@@ -88,6 +88,13 @@
         }))
 
 
+def set_derived_series_sync_feature_flag(test_case):
+    test_case.useFixture(FeatureFixture({
+        u'soyuz.derived_series_sync.enabled': u'on',
+        u'soyuz.derived-series-ui.enabled': u'on',
+        }))
+
+
 class TestDistroSeriesView(TestCaseWithFactory):
     """Test the distroseries +index view."""
 
@@ -1054,12 +1061,27 @@
         # synced package.
         derived_series = self._setUpDSD()[0]
         person = self._setUpPersonWithPerm(derived_series)
+        set_derived_series_sync_feature_flag(self)
         with person_logged_in(person):
             view = create_initialized_view(
                 derived_series, '+localpackagediffs')
 
             self.assertTrue(view.canPerformSync())
 
+    def test_canPerformSync_non_anon_feature_disabled(self):
+        # Logged-in users with a permission on the destination archive
+        # are not presented with options to perform syncs when the
+        # feature flag is not enabled.
+        self.assertIs(
+            None, getFeatureFlag('soyuz.derived_series_sync.enabled'))
+        derived_series = self._setUpDSD()[0]
+        person = self._setUpPersonWithPerm(derived_series)
+        with person_logged_in(person):
+            view = create_initialized_view(
+                derived_series, '+localpackagediffs')
+
+            self.assertFalse(view.canPerformSync())
+
     def _syncAndGetView(self, derived_series, person, sync_differences,
                         difference_type=None, view_name='+localpackagediffs'):
         # A helper to get the POST'ed sync view.
@@ -1076,6 +1098,7 @@
         # An error is raised when a sync is requested without any selection.
         derived_series = self._setUpDSD()[0]
         person = self._setUpPersonWithPerm(derived_series)
+        set_derived_series_sync_feature_flag(self)
         view = self._syncAndGetView(derived_series, person, [])
 
         self.assertEqual(1, len(view.errors))
@@ -1086,6 +1109,7 @@
         # An error is raised when an invalid difference is selected.
         derived_series = self._setUpDSD('my-src-name')[0]
         person = self._setUpPersonWithPerm(derived_series)
+        set_derived_series_sync_feature_flag(self)
         view = self._syncAndGetView(
             derived_series, person, ['some-other-name'])
 
@@ -1100,6 +1124,7 @@
         # sync packages.
         derived_series = self._setUpDSD('my-src-name')[0]
         person = self._setUpPersonWithPerm(derived_series)
+        set_derived_series_sync_feature_flag(self)
         view = self._syncAndGetView(
             derived_series, person, ['my-src-name'])
 
@@ -1137,6 +1162,7 @@
             'my-src-name')
         person, another_component = self.makePersonWithComponentPermission(
             derived_series.main_archive)
+        set_derived_series_sync_feature_flag(self)
         view = self._syncAndGetView(
             derived_series, person, ['my-src-name'])
 
@@ -1193,6 +1219,7 @@
         self.assertIs(None, pubs)
 
         # Now, sync the source from the parent using the form.
+        set_derived_series_sync_feature_flag(self)
         view = self._syncAndGetView(
             derived_series, person, ['my-src-name'])
 
@@ -1213,6 +1240,7 @@
             'my-src-name', difference_type=missing, versions=versions)
         person, another_component = self.makePersonWithComponentPermission(
             derived_series.main_archive)
+        set_derived_series_sync_feature_flag(self)
         view = self._syncAndGetView(
             derived_series, person, ['my-src-name'],
             view_name='+missingpackages')
@@ -1234,6 +1262,7 @@
         derived_series, parent_series, sourcepackagename = self._setUpDSD(
             'my-src-name', distribution=ubuntu, versions=versions)
         ubuntu_security = getUtility(IPersonSet).getByName('ubuntu-security')
+        set_derived_series_sync_feature_flag(self)
         with person_logged_in(ubuntu_security):
             self.assertTrue(
                 check_permission(

=== modified file 'lib/lp/services/features/flags.py'
--- lib/lp/services/features/flags.py	2011-05-07 20:29:57 +0000
+++ lib/lp/services/features/flags.py	2011-05-09 15:52:54 +0000
@@ -69,6 +69,10 @@
      'boolean',
      'Enables derivative distributions pages.',
      ''),
+    ('soyuz.derived-series-sync.enabled',
+     'boolean',
+     'Enables syncing of packages on derivative distributions pages.',
+     ''),
     ('soyuz.derived_series_jobs.enabled',
      'boolean',
      "Compute package differences for derived distributions.",