Merge lp:~stevenk/launchpad/information_type-notification-flag into lp:launchpad

[Steve Kowalik]

Bug notifications showing information_type now use a separate feature flag.

In order to make it safer and possible to switch to showing information_type in the UI for a portion of our users, switch the notifications code to using a separate feature flag.

[William Grant (wgrant)]

I'd prefer an imperative form of the flag description (ie. "Calculate and store [...]"), but otherwise fine.

review: Approve (code)

=== modified file 'lib/lp/bugs/adapters/bugchange.py'
--- lib/lp/bugs/adapters/bugchange.py	2012-04-30 01:57:48 +0000
+++ lib/lp/bugs/adapters/bugchange.py	2012-05-08 06:05:20 +0000
@@ -108,7 +108,7 @@
     # log and in notification emails.
     bug_change_field_names = ['duplicateof', 'title', 'description']
     if bool(getFeatureFlag(
-        'disclosure.show_information_type_in_ui.enabled')):
+        'disclosure.information_type_notifications.enabled')):
         bug_change_field_names.append('information_type')
     else:
         bug_change_field_names.extend(('private', 'security_related'))
@@ -573,7 +573,7 @@
                 self.title(self.old_value), self.title(self.new_value))}
 
 
-# XXX: This can be deleted when show_information_type_in_ui is removed.
+# XXX: This can be deleted when information_type_notifications is removed.
 class BugVisibilityChange(AttributeChange):
     """Describes a change to a bug's visibility."""
 
@@ -605,7 +605,7 @@
         return {'text': "** Visibility changed to: %s" % visibility_string}
 
 
-# XXX: This can be deleted when show_information_type_in_ui is removed.
+# XXX: This can be deleted when information_type_notifications is removed.
 class BugSecurityChange(AttributeChange):
     """Describes a change to a bug's security setting."""
 

=== modified file 'lib/lp/bugs/stories/bugs/xx-bug-activity.txt'
--- lib/lp/bugs/stories/bugs/xx-bug-activity.txt	2012-04-30 01:57:48 +0000
+++ lib/lp/bugs/stories/bugs/xx-bug-activity.txt	2012-05-08 06:05:20 +0000
@@ -322,9 +322,27 @@
 Changes to information_type are shown when the feature flag is set.
 
     >>> from lp.services.features.testing import FeatureFixture
-    >>> feature_flag = {
-    ...     'disclosure.show_information_type_in_ui.enabled': 'on'}
-    >>> with FeatureFixture(feature_flag):
+    >>> feature_flags = {
+    ...     'disclosure.information_type_notifications.enabled': 'on'}
+    >>> with FeatureFixture(feature_flags):
+    ...     admin_browser.open(
+    ...         "http://bugs.launchpad.dev/evolution/+bug/7/+secrecy")
+    ...     admin_browser.getControl(
+    ...         "This bug report should be private").selected = True
+    ...     admin_browser.getControl('Change').click()
+    ...     admin_browser.open("http://bugs.launchpad.dev/evolution/+bug/7")
+    ...     print_comments(admin_browser.contents)
+    Foo Bar (name16)
+    ... ago
+    information type:
+    Public => User Data
+    --------
+
+    >>> from lp.services.features.testing import FeatureFixture
+    >>> feature_flags = {
+    ...     'disclosure.show_information_type_in_ui.enabled': 'on',
+    ...     'disclosure.information_type_notifications.enabled': 'on'}
+    >>> with FeatureFixture(feature_flags):
     ...     admin_browser.open(
     ...         "http://bugs.launchpad.dev/jokosher/+bug/14/+secrecy")
     ...     admin_browser.getControl("User Data").selected = True

=== modified file 'lib/lp/bugs/subscribers/bug.py'
--- lib/lp/bugs/subscribers/bug.py	2012-04-27 05:56:48 +0000
+++ lib/lp/bugs/subscribers/bug.py	2012-05-08 06:05:20 +0000
@@ -118,7 +118,7 @@
     changes = {}
     fields = ["title", "description", "name"]
     if bool(getFeatureFlag(
-        'disclosure.show_information_type_in_ui.enabled')):
+        'disclosure.information_type_notifications.enabled')):
         fields.append('information_type')
     else:
         fields.extend(('private', 'security_related'))

=== modified file 'lib/lp/bugs/tests/test_bugchanges.py'
--- lib/lp/bugs/tests/test_bugchanges.py	2012-05-03 01:14:29 +0000
+++ lib/lp/bugs/tests/test_bugchanges.py	2012-05-08 06:05:20 +0000
@@ -624,7 +624,7 @@
         bug = self.factory.makeBug()
         self.saveOldChanges(bug=bug)
         feature_flag = {
-            'disclosure.show_information_type_in_ui.enabled': 'on'}
+            'disclosure.information_type_notifications.enabled': 'on'}
         bug_before_modification = Snapshot(bug, providing=providedBy(bug))
         with FeatureFixture(feature_flag):
             bug.transitionToInformationType(
@@ -656,7 +656,7 @@
         bug = self.factory.makeBug()
         self.saveOldChanges(bug=bug)
         feature_flags = {
-            'disclosure.show_information_type_in_ui.enabled': 'on',
+            'disclosure.information_type_notifications.enabled': 'on',
             'disclosure.display_userdata_as_private.enabled': 'on'}
         bug_before_modification = Snapshot(bug, providing=providedBy(bug))
         with FeatureFixture(feature_flags):
@@ -688,7 +688,7 @@
         bug = self.factory.makeBug(owner=person)
         self.saveOldChanges(bug=bug)
         feature_flag = {
-            'disclosure.show_information_type_in_ui.enabled': 'on'}
+            'disclosure.information_type_notifications.enabled': 'on'}
         webservice = launchpadlib_for('test', person)
         lp_bug = webservice.load(api_url(bug))
         with FeatureFixture(feature_flag):

=== modified file 'lib/lp/services/features/flags.py'
--- lib/lp/services/features/flags.py	2012-05-07 07:38:01 +0000
+++ lib/lp/services/features/flags.py	2012-05-08 06:05:20 +0000
@@ -320,6 +320,13 @@
      '',
      '',
      ''),
+    ('disclosure.information_type_notifications.enabled',
+     'boolean',
+     ('If true, calculate and store bugchange notifications to reference '
+      'information_type rather than private/security_related.'),
+     '',
+     '',
+     ''),
     ])
 
 # The set of all flag names that are documented.