1
=== modified file 'lib/lp/registry/model/structuralsubscription.py'
2
--- lib/lp/registry/model/structuralsubscription.py	2010-10-05 14:43:49 +0000
3
+++ lib/lp/registry/model/structuralsubscription.py	2010-10-05 14:43:50 +0000
4
@@ -516,10 +516,12 @@
5
516
            ]
516
            ]
6
517
517
7
518
        conditions = [
518
        conditions = [
12
519
            # There's no filter or ...
519
            StructuralSubscription.bug_notification_level >= level,
13
520
            Or(BugSubscriptionFilter.id == None,
520
            Or(
14
521
               # there is a filter ...
521
                # There's no filter or ...
15
522
               And(
522
                BugSubscriptionFilter.id == None,
16
523
                # there is a filter and ...
17
524
                And(
18
523
                    # there's no status filter, or there is a status filter
525
                    # there's no status filter, or there is a status filter
19
524
                    # and and it matches.
526
                    # and and it matches.
20
525
                    Or(BugSubscriptionFilterStatus.id == None,
527
                    Or(BugSubscriptionFilterStatus.id == None,
21
526
528
22
=== modified file 'lib/lp/registry/tests/test_structuralsubscriptiontarget.py'
23
--- lib/lp/registry/tests/test_structuralsubscriptiontarget.py	2010-10-05 14:43:49 +0000
24
+++ lib/lp/registry/tests/test_structuralsubscriptiontarget.py	2010-10-05 14:43:50 +0000
25
@@ -247,6 +247,30 @@
26
247
            bugtask.bug, BugNotificationLevel.NOTHING)
247
            bugtask.bug, BugNotificationLevel.NOTHING)
27
248
        self.assertEqual([subscription], list(subscriptions_for_bug))
248
        self.assertEqual([subscription], list(subscriptions_for_bug))
28
249
249
29
250
    def test_getSubscriptionsForBug_with_filter_on_level(self):
30
251
        # All structural subscriptions have a level for bug notifications
31
252
        # which getSubscriptionsForBug() observes.
32
253
        bugtask = self.makeBugTask()
33
254
34
255
        # Create a new METADATA level subscription on self.target.
35
256
        login_person(self.ordinary_subscriber)
36
257
        subscription = self.target.addSubscription(
37
258
            self.ordinary_subscriber, self.ordinary_subscriber)
38
259
        subscription.bug_notification_level = BugNotificationLevel.METADATA
39
260
40
261
        # The subscription is found when looking for NOTHING or above.
41
262
        subscriptions_for_bug = self.target.getSubscriptionsForBug(
42
263
            bugtask.bug, BugNotificationLevel.NOTHING)
43
264
        self.assertEqual([subscription], list(subscriptions_for_bug))
44
265
        # The subscription is found when looking for METADATA or above.
45
266
        subscriptions_for_bug = self.target.getSubscriptionsForBug(
46
267
            bugtask.bug, BugNotificationLevel.METADATA)
47
268
        self.assertEqual([subscription], list(subscriptions_for_bug))
48
269
        # The subscription is not found when looking for COMMENTS or above.
49
270
        subscriptions_for_bug = self.target.getSubscriptionsForBug(
50
271
            bugtask.bug, BugNotificationLevel.COMMENTS)
51
272
        self.assertEqual([], list(subscriptions_for_bug))
52
273
53
250
    def test_getSubscriptionsForBug_with_multiple_filters(self):
274
    def test_getSubscriptionsForBug_with_multiple_filters(self):
54
251
        # If multiple filters exist for a subscription, all filters must
275
        # If multiple filters exist for a subscription, all filters must
55
252
        # match.
276
        # match.
Reviewer	Review Type	Status
Gavin Panella (community)	code	Abstain on 2010-10-05
Māris Fogels (community)		Approve on 2010-10-05
Review via email: mp+37608@code.launchpad.net