launchpad-reviewers team mailing list archive

[Данило Шеган <danilo@xxxxxxxxxxxxx>]

Данило Шеган has proposed merging lp:~danilo/launchpad/mail-header-discrepancy into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~danilo/launchpad/mail-header-discrepancy/+merge/54172

= Fix mail header text =

We refer to bug subscriptions as filters in the mail headers, whereas in
the UI we expose them as just "subscriptions".  This fixes that (it was
discussed and then forgotten about in the original branch).

== Tests ==

bin/test -cvvt TestEmailNotificationsWithFilters -t bugnotificationbuilder

= Launchpad lint =

Checking for conflicts and issues in changed files.

Linting changed files:
  lib/lp/bugs/mail/tests/test_bugnotificationbuilder.py
  lib/lp/bugs/scripts/tests/test_bugnotification.py
  lib/lp/bugs/mail/bugnotificationbuilder.py
  lib/lp/bugs/scripts/bugnotification.py
-- 
https://code.launchpad.net/~danilo/launchpad/mail-header-discrepancy/+merge/54172
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~danilo/launchpad/mail-header-discrepancy into lp:launchpad.

=== modified file 'lib/lp/bugs/mail/bugnotificationbuilder.py'
--- lib/lp/bugs/mail/bugnotificationbuilder.py	2011-03-02 16:22:19 +0000
+++ lib/lp/bugs/mail/bugnotificationbuilder.py	2011-03-21 09:30:47 +0000
@@ -195,6 +195,6 @@
         if filters is not None:
             for filter in filters:
                 message.add_header(
-                    'X-Launchpad-Subscription-Filter', filter)
+                    'X-Launchpad-Subscription', filter)
 
         return message

=== modified file 'lib/lp/bugs/mail/tests/test_bugnotificationbuilder.py'
--- lib/lp/bugs/mail/tests/test_bugnotificationbuilder.py	2011-03-02 17:24:43 +0000
+++ lib/lp/bugs/mail/tests/test_bugnotificationbuilder.py	2011-03-21 09:30:47 +0000
@@ -29,7 +29,7 @@
         message = self.builder.build('from', 'to', 'body', 'subject',
                                      utc_now, filters=[])
         self.assertIs(None,
-                      message.get("X-Launchpad-Subscription-Filter", None))
+                      message.get("X-Launchpad-Subscription", None))
 
     def test_build_filters_single(self):
         """Filters are added."""
@@ -38,7 +38,7 @@
                                      utc_now, filters=[u"Testing filter"])
         self.assertContentEqual(
             [u"Testing filter"],
-            message.get_all("X-Launchpad-Subscription-Filter"))
+            message.get_all("X-Launchpad-Subscription"))
 
     def test_build_filters_multiple(self):
         """Filters are added."""
@@ -48,4 +48,4 @@
             filters=[u"Testing filter", u"Second testing filter"])
         self.assertContentEqual(
             [u"Testing filter", u"Second testing filter"],
-            message.get_all("X-Launchpad-Subscription-Filter"))
+            message.get_all("X-Launchpad-Subscription"))

=== modified file 'lib/lp/bugs/scripts/bugnotification.py'
--- lib/lp/bugs/scripts/bugnotification.py	2011-03-02 16:22:19 +0000
+++ lib/lp/bugs/scripts/bugnotification.py	2011-03-21 09:30:47 +0000
@@ -172,7 +172,7 @@
                     filters.add(notification_filter.description)
         if filters:
             # There are some filters as well, add it to the email body.
-            filters_text = u"\nMatching filters: %s" % ", ".join(filters)
+            filters_text = u"\nMatching subscriptions: %s" % ", ".join(filters)
         else:
             filters_text = u""
         # XXX deryck 2009-11-17 Bug #484319

=== modified file 'lib/lp/bugs/scripts/tests/test_bugnotification.py'
--- lib/lp/bugs/scripts/tests/test_bugnotification.py	2011-03-02 16:22:19 +0000
+++ lib/lp/bugs/scripts/tests/test_bugnotification.py	2011-03-21 09:30:47 +0000
@@ -961,11 +961,11 @@
         for message in messages:
             if by_person:
                 headers[message['to']] = message.get_all(
-                    "X-Launchpad-Subscription-Filter", [])
+                    "X-Launchpad-Subscription", [])
             else:
                 headers = headers.union(
                     set(message.get_all(
-                        "X-Launchpad-Subscription-Filter", [])))
+                        "X-Launchpad-Subscription", [])))
         return headers
 
     def getSubscriptionEmailBody(self, by_person=False):
@@ -978,7 +978,7 @@
         for message in messages:
             filters_line = None
             for line in message.get_payload().splitlines():
-                if line.startswith("Matching filters: "):
+                if line.startswith("Matching subscriptions: "):
                     filters_line = line
                     break
             if filters_line is not None:
@@ -1040,7 +1040,7 @@
         # include that particular filter description in the body.
         bug_filter = self.addFilter(u"Test filter")
 
-        self.assertContentEqual([u"Matching filters: Test filter"],
+        self.assertContentEqual([u"Matching subscriptions: Test filter"],
                                 self.getSubscriptionEmailBody())
 
     def test_body_multiple(self):
@@ -1050,5 +1050,5 @@
         bug_filter = self.addFilter(u"Second filter")
 
         self.assertContentEqual(
-            [u"Matching filters: First filter, Second filter"],
+            [u"Matching subscriptions: First filter, Second filter"],
             self.getSubscriptionEmailBody())