Rev 2584: Revert over-eager cleanup of test_run_bzr_error in http://sourcefrog.net/bzr/cleanup-runbzr

[Martin Pool]

At http://sourcefrog.net/bzr/cleanup-runbzr

------------------------------------------------------------
revno: 2584
revision-id: mbp at sourcefrog.net-20070704085614-b4e73tc8zymf0i34
parent: mbp at sourcefrog.net-20070704084915-g3nppvuq92xjjcux
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: cleanup-runbzr
timestamp: Wed 2007-07-04 18:56:14 +1000
message:
  Revert over-eager cleanup of test_run_bzr_error
modified:
  bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
=== modified file 'bzrlib/tests/blackbox/test_selftest.py'
--- a/bzrlib/tests/blackbox/test_selftest.py	2007-07-04 08:49:15 +0000
+++ b/bzrlib/tests/blackbox/test_selftest.py	2007-07-04 08:56:14 +0000
@@ -461,11 +461,15 @@
 class TestRunBzrError(ExternalBase):
 
     def test_run_bzr_error(self):
-        out, err = self.run_bzr_error(['^$'], ['rocks'])
+        # retcode=0 is specially needed here because run_bzr_error expects
+        # an error (oddly enough) but we want to test the case of not
+        # actually getting one
+        out, err = self.run_bzr_error(['^$'], ['rocks'], retcode=0)
         self.assertEqual(out, 'It sure does!\n')
-
-        out, err = self.run_bzr_error(["bzr: ERROR: foobarbaz is not versioned"],
-                                      ['file-id', 'foobarbaz'])
+        # now test actually getting an error
+        out, err = self.run_bzr_error(
+                ["bzr: ERROR: foobarbaz is not versioned"],
+                ['file-id', 'foobarbaz'])
 
 
 class TestSelftestCleanOutput(TestCaseInTempDir):