Rev 4662: Make the check more explicit. in file:///home/vila/src/bzr/experimental/conflict-manager/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/conflict-manager/

------------------------------------------------------------
revno: 4662
revision-id: v.ladeuil+lp at free.fr-20101115092403-rjd4a6854nzaalpt
parent: v.ladeuil+lp at free.fr-20101113130132-eob87zj2ikm2ury2
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: more-tests
timestamp: Mon 2010-11-15 10:24:03 +0100
message:
  Make the check more explicit.
  
  * bzrlib/tests/test_conflicts.py:
  (TestResolveMissingParent): Check stderr.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_conflicts.py'
--- a/bzrlib/tests/test_conflicts.py	2010-11-10 16:24:31 +0000
+++ b/bzrlib/tests/test_conflicts.py	2010-11-15 09:24:03 +0000
@@ -728,14 +728,16 @@
     def test_resolve_taking_this(self):
         self.run_script("""
 $ bzr resolve --take-this dir
-2>...
+2>deleted dir/file2
+2>deleted dir
+2>2 conflict(s) resolved, 0 remaining
 $ bzr commit -q --strict -m 'No more conflicts nor unknown files'
 """)
 
     def test_resolve_taking_other(self):
         self.run_script("""
 $ bzr resolve --take-other dir
-2>...
+2>2 conflict(s) resolved, 0 remaining
 $ bzr commit -q --strict -m 'No more conflicts nor unknown files'
 """)