launchpad-reviewers team mailing list archive

[William Grant <me@xxxxxxxxxxxxxxxxxx>]

William Grant has proposed merging lp:~wgrant/launchpad/testfix-r17474 into lp:launchpad.

Commit message:
Fix test failures from way back in r17474.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~wgrant/launchpad/testfix-r17474/+merge/258503

Fix test failures from way back in r17474.

Yay for our early lxc-start-ephemeral not passing through the exit code, so subunit stream corruption means success.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~wgrant/launchpad/testfix-r17474 into lp:launchpad.

=== modified file 'lib/lp/code/browser/tests/test_branch.py'
--- lib/lp/code/browser/tests/test_branch.py	2015-03-05 11:44:07 +0000
+++ lib/lp/code/browser/tests/test_branch.py	2015-05-07 14:02:12 +0000
@@ -558,7 +558,7 @@
         logout()
         with StormStatementRecorder() as recorder:
             browser.open(branch_url)
-        self.assertThat(recorder, HasQueryCount(Equals(27)))
+        self.assertThat(recorder, HasQueryCount(Equals(28)))
 
 
 class TestBranchViewPrivateArtifacts(BrowserTestCase):

=== modified file 'lib/lp/code/model/codereviewcomment.py'
--- lib/lp/code/model/codereviewcomment.py	2015-04-30 21:49:59 +0000
+++ lib/lp/code/model/codereviewcomment.py	2015-05-07 14:02:12 +0000
@@ -96,7 +96,7 @@
     def title(self):
         return ('Comment on proposed merge of %(source)s into %(target)s' %
             {'source': self.branch_merge_proposal.merge_source.display_name,
-             'target': self.branch_merge_proposal.merge_source.display_name,
+             'target': self.branch_merge_proposal.merge_target.display_name,
             })
 
     @property