Rev 2258: Tag conflicts from push go to stdout. in http://sourcefrog.net/bzr/tags

[Martin Pool]

At http://sourcefrog.net/bzr/tags

------------------------------------------------------------
revno: 2258
revision-id: mbp at sourcefrog.net-20070225111726-w5a6asp76autb02f
parent: mbp at sourcefrog.net-20070225111100-iqd6o1x34mv0a60g
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Sun 2007-02-25 22:17:26 +1100
message:
  Tag conflicts from push go to stdout.
  Cleanup blackbox tests.
modified:
  bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
=== modified file 'bzrlib/tests/blackbox/test_push.py'
--- a/bzrlib/tests/blackbox/test_push.py	2007-02-25 10:47:29 +0000
+++ b/bzrlib/tests/blackbox/test_push.py	2007-02-25 11:17:26 +0000
@@ -80,12 +80,14 @@
         # test implicit --remember after resolving previous failure
         uncommit(branch=branch_b, tree=tree_b)
         transport.delete('branch_b/c')
-        out = self.run_bzr('push')
+        out, err = self.run_bzr('push')
         path = branch_a.get_push_location()
-        self.assertEquals(('Using saved location: %s\n' 
-                           % (local_path_from_url(path),)
-                          , 'All changes applied successfully.\n'
-                            'Pushed up to revision 2.\n'), out)
+        self.assertEquals(out,
+                          'Using saved location: %s\n' 
+                          'Pushed up to revision 2.\n'
+                          % local_path_from_url(path))
+        self.assertEqual(err,
+                         'All changes applied successfully.\n')
         self.assertEqual(path,
                          branch_b.bzrdir.root_transport.base)
         # test explicit --remember