Bazaar Git Plugin

Merge lp:~maxb/bzr-git/tolerate-bzr-2.2-in-tests into lp:bzr-git

  1. tolerate-bzr-2.2-in-tests
  2. Merge into trunk
Proposed by Max Bowsher
Status: Merged
Merged at revision: 1074
Proposed branch: lp:~maxb/bzr-git/tolerate-bzr-2.2-in-tests
Merge into: lp:bzr-git
Diff against target: 15 lines (+3/-2)
1 file modified
tests/test_blackbox.py (+3/-2)
To merge this branch: bzr merge lp:~maxb/bzr-git/tolerate-bzr-2.2-in-tests
Reviewer Review Type Date Requested Status
Jelmer Vernooij code Approve
Review via email: mp+47480@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

Thanks, I'll merge.

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/test_blackbox.py'
2--- tests/test_blackbox.py 2010-12-11 18:31:30 +0000
3+++ tests/test_blackbox.py 2011-01-25 23:42:28 +0000
4@@ -128,8 +128,9 @@
5
6 output, error = self.run_bzr(["tag", "bar"])
7
8- self.assertEquals(error, 'Created tag bar.\n')
9- self.assertEquals(output, '')
10+ # bzr <= 2.2 emits this message in the output stream
11+ # bzr => 2.3 emits this message in the error stream
12+ self.assertEquals(error + output, 'Created tag bar.\n')
13
14 def test_init_repo(self):
15 output, error = self.run_bzr(["init-repo", "--git", "bla.git"])

Subscribers

People subscribed via source and target branches

to all changes: