launchpad-reviewers team mailing list archive

[Benji York <benji@xxxxxxxxxxxxx>]

Benji York has proposed merging lp:~benji/launchpad/bug-649252 into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  #649252 No unsubscribe link in emails for non-verbose bug notifications
  https://bugs.launchpad.net/bugs/649252

For more details, see:
https://code.launchpad.net/~benji/launchpad/bug-649252/+merge/49876

When LP users check the "Include bug descriptions when sending me bug
notifications" option on their profile they get "verbose" emails that
include an unsubscribe link in messages about bugs to which they are
directly subscribed.  If they do not check that option, they get shorter
email messages that do not include the unsubscribe link.

This branch changes the behavior so that the unsubscribe link is always
present.

The doctest (lib/canonical/launchpad/emailtemplates/bug-notification.txt)
that deals with bug notification emails needed a couple of changes
because of the new contents of the email and I added a small section to
explicitly call out the unsubscribe link in the non-verbose email
messages.

My lint is broken so I don't have anything to say there.  If I get it
fixed I'll update the MP.

-- 
https://code.launchpad.net/~benji/launchpad/bug-649252/+merge/49876
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~benji/launchpad/bug-649252 into lp:launchpad.

=== modified file 'lib/canonical/launchpad/emailtemplates/bug-notification.txt'
--- lib/canonical/launchpad/emailtemplates/bug-notification.txt	2011-01-06 14:43:46 +0000
+++ lib/canonical/launchpad/emailtemplates/bug-notification.txt	2011-02-15 20:59:16 +0000
@@ -6,3 +6,5 @@
 
 Title:
 %(bug_title)s
+
+%(unsubscribe_notice)s

=== modified file 'lib/lp/bugs/doc/bugnotification-sending.txt'
--- lib/lp/bugs/doc/bugnotification-sending.txt	2011-02-08 14:34:55 +0000
+++ lib/lp/bugs/doc/bugnotification-sending.txt	2011-02-15 20:59:16 +0000
@@ -128,6 +128,7 @@
     Title:
       Firefox does not support SVG
     <BLANKLINE>
+    ...
     ----------------------------------------------------------------------
 
 You can see that the message above contains the bug's initial comment's
@@ -343,7 +344,7 @@
      'http://bugs.launchpad.dev/bugs/1',
      '',
      'Title:',
-     '  Firefox does not support SVG']
+     '  Firefox does not support SVG'...]
 
     >>> flush_notifications()
 
@@ -429,7 +430,7 @@
     <BLANKLINE>
     a comment.
     <BLANKLINE>
-    --
+    -- 
     You received this bug notification because you are a member of Ubuntu
     Team, which is the registrant for Ubuntu.
     http://bugs.launchpad.dev/bugs/16
@@ -437,6 +438,8 @@
     Title:
       new bug
     <BLANKLINE>
+    <BLANKLINE>
+    <BLANKLINE>
     ----------------------------------------------------------------------
     To: test@xxxxxxxxxxxxx
     From: Sample Person <16@xxxxxxxxxxxxxxxxxx>
@@ -448,7 +451,7 @@
     <BLANKLINE>
     a comment.
     <BLANKLINE>
-    --
+    -- 
     You received this bug notification because you are a direct subscriber
     of the bug.
     http://bugs.launchpad.dev/bugs/16
@@ -456,6 +459,9 @@
     Title:
       new bug
     <BLANKLINE>
+    To unsubscribe from this bug, go to:
+    http://bugs.launchpad.dev/ubuntu/+bug/16/+subscribe
+    <BLANKLINE>
     ----------------------------------------------------------------------
 
     >>> flush_notifications()
@@ -985,6 +991,14 @@
     <BLANKLINE>
     ----------------------------------------------------------------------
 
+However, Concise Person does get an unsubscribe link.
+
+    >>> print_notification(collated_messages['concise@xxxxxxxxxxx'][0])
+    To: concise@xxxxxxxxxxx
+    ...
+    To unsubscribe from this bug, go to:...
+
+
 Neither does Verbose Team Person - while the team wants verbose emails,
 he wants concise ones.
 
@@ -1085,12 +1099,11 @@
 
     >>> message = collated_messages['verboseteam@xxxxxxxxxxx'][0]
     >>> payload = message.get_payload(decode=True)
-    >>> print payload.split('\n')
+    >>> print payload.strip().split('\n')
     [...
      'Title:',
      '  In the beginning, the universe was created. This has made a lot of',
-     '  people very angry and has been widely regarded as a bad move',
-     '']
+     '  people very angry and has been widely regarded as a bad move']
 
 Self-Generated Bug Notifications
 --------------------------------