Merge lp:~danilo/launchpad/devel-bug-720826-clear-level-on-delete into lp:launchpad

[Данило Шеган]

[r=leonardr][bug=720826][incr] Clear bug_notification_level on the "default" bug subscription filter when the final filter is removed.

= Unset bug notification level on final filter removal =

== Background ==

For every structural subscription, we have recently started enforcing that there is at least one BugSubscriptionFilter to match it. It is initially configured to not set any filtering.

As part of QA for
https://code.launchpad.net/~danilo/launchpad/auto-create-bugsubscriptionfilter/+merge/50371

I realized that when trying to remove final subscription filter, we do not unset the bug_notification_level to the default value.

This fixes that, and can be QAd in the same manner as the above MP.

== Tests ==

bin/test -cvvt test_delete_final

== Demo and Q/A ==

Add a structural subscription and go to https://bugs.qastaging.launchpad.net/people/+me/+structural-subscriptions and first set the notification level to non-default value (eg. lifecycle) and then try deleting it and see how it gets reset.

= Launchpad lint =

Checking for conflicts and issues in changed files.

Linting changed files:
  lib/lp/bugs/model/bugsubscriptionfilter.py
  lib/lp/bugs/model/tests/test_bugsubscriptionfilter.py

[Leonard Richardson (leonardr)]

This looks good.

Is there a better way to indicate that BugNotificationLevel.COMMENTS is the default value? That's the only problem I had reading this--it looked a little arbitrary.

review: Approve

[Данило Шеган (danilo)]

As discussed on IRC, yes there is. I am using that now.

=== modified file 'lib/lp/bugs/interfaces/bugsubscriptionfilter.py'
--- lib/lp/bugs/interfaces/bugsubscriptionfilter.py	2011-02-01 04:57:42 +0000
+++ lib/lp/bugs/interfaces/bugsubscriptionfilter.py	2011-03-01 16:52:25 +0000
@@ -64,7 +64,7 @@
         Choice(
             title=_("Bug notification level"), required=True,
             vocabulary=BugNotificationLevel,
-            default=BugNotificationLevel.NOTHING,
+            default=BugNotificationLevel.COMMENTS,
             description=_("The volume and type of bug notifications "
                           "this subscription will generate.")))
 

=== modified file 'lib/lp/bugs/model/bugsubscriptionfilter.py'
--- lib/lp/bugs/model/bugsubscriptionfilter.py	2011-02-18 17:37:10 +0000
+++ lib/lp/bugs/model/bugsubscriptionfilter.py	2011-03-01 16:52:25 +0000
@@ -202,5 +202,9 @@
     def delete(self):
         """See `IBugSubscriptionFilter`."""
         self.importances = self.statuses = self.tags = ()
+        # Revert bug notification level to the default.
+        self.bug_notification_level = (
+            IBugSubscriptionFilter.getDescriptionFor(
+                'bug_notification_level').default)
         if self._has_other_filters():
             Store.of(self).remove(self)

=== modified file 'lib/lp/bugs/model/tests/test_bugsubscriptionfilter.py'
--- lib/lp/bugs/model/tests/test_bugsubscriptionfilter.py	2011-02-18 17:37:10 +0000
+++ lib/lp/bugs/model/tests/test_bugsubscriptionfilter.py	2011-03-01 16:52:25 +0000
@@ -120,6 +120,8 @@
         # Final remaining `BugSubscriptionFilter` can't be deleted.
         # Only the linked data is removed.
         bug_subscription_filter = self.subscription.bug_filters.one()
+        bug_subscription_filter.bug_notification_level = (
+            BugNotificationLevel.LIFECYCLE)
         bug_subscription_filter.importances = [BugTaskImportance.LOW]
         bug_subscription_filter.statuses = [BugTaskStatus.NEW]
         bug_subscription_filter.tags = [u"foo"]
@@ -129,6 +131,8 @@
         bug_subscription_filter.delete()
         IStore(bug_subscription_filter).flush()
         self.assertIsNot(None, Store.of(bug_subscription_filter))
+        self.assertEquals(BugNotificationLevel.COMMENTS,
+                          bug_subscription_filter.bug_notification_level)
         self.assertContentEqual([], bug_subscription_filter.statuses)
         self.assertContentEqual([], bug_subscription_filter.importances)
         self.assertContentEqual([], bug_subscription_filter.tags)