launchpad-reviewers team mailing list archive

[Nigel Babu <nigelbabu@xxxxxxxxx>]

Nigel Babu has proposed merging lp:~nigelbabu/launchpad/merge-review-mail-824487 into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #824487 in Launchpad itself: "Merge proposal review mail notification has no space between result and comment"
  https://bugs.launchpad.net/launchpad/+bug/824487

For more details, see:
https://code.launchpad.net/~nigelbabu/launchpad/merge-review-mail-824487/+merge/73765

= Description =
Adds a new line between Review status and code review comment

= Launchpad lint =

Checking for conflicts and issues in changed files.

Linting changed files:
  lib/lp/code/mail/codereviewcomment.py
  lib/lp/code/mail/tests/test_codereviewcomment.py
-- 
https://code.launchpad.net/~nigelbabu/launchpad/merge-review-mail-824487/+merge/73765
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~nigelbabu/launchpad/merge-review-mail-824487 into lp:launchpad.

=== modified file 'lib/lp/code/mail/codereviewcomment.py'
--- lib/lp/code/mail/codereviewcomment.py	2011-03-04 01:04:06 +0000
+++ lib/lp/code/mail/codereviewcomment.py	2011-09-02 09:46:44 +0000
@@ -92,7 +92,7 @@
                 vote_tag = ''
             else:
                 vote_tag = ' ' + self.code_review_comment.vote_tag
-            self.body_prefix = 'Review: %s%s\n' % (
+            self.body_prefix = 'Review: %s%s\n\n' % (
                 self.code_review_comment.vote.title, vote_tag)
         self.body_main = self.message.text_contents
         self.proposal_url = canonical_url(self.merge_proposal)

=== modified file 'lib/lp/code/mail/tests/test_codereviewcomment.py'
--- lib/lp/code/mail/tests/test_codereviewcomment.py	2011-08-12 14:39:51 +0000
+++ lib/lp/code/mail/tests/test_codereviewcomment.py	2011-09-02 09:46:44 +0000
@@ -195,7 +195,7 @@
         ctrl = mailer.generateEmail(
             subscriber.preferredemail.email, subscriber)
         self.assertEqual('Review: Approve', ctrl.body.splitlines()[0])
-        self.assertEqual(ctrl.body.splitlines()[1:-3],
+        self.assertEqual(ctrl.body.splitlines()[2:-3],
                          mailer.message.text_contents.splitlines())
 
     def test_generateEmailWithVoteAndTag(self):
@@ -205,7 +205,7 @@
         ctrl = mailer.generateEmail(
             subscriber.preferredemail.email, subscriber)
         self.assertEqual('Review: Approve dbtag', ctrl.body.splitlines()[0])
-        self.assertEqual(ctrl.body.splitlines()[1:-3],
+        self.assertEqual(ctrl.body.splitlines()[2:-3],
                          mailer.message.text_contents.splitlines())
 
     def makeComment(self, email_message):