Rev 2583: Remove unnecessary retcode=0 to run_bzr calls in http://sourcefrog.net/bzr/cleanup-runbzr
Martin Pool
mbp at sourcefrog.net
Wed Jul 4 09:49:16 BST 2007
At http://sourcefrog.net/bzr/cleanup-runbzr
------------------------------------------------------------
revno: 2583
revision-id: mbp at sourcefrog.net-20070704084915-g3nppvuq92xjjcux
parent: mbp at sourcefrog.net-20070704084622-6b8enfv9o71s7ung
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: cleanup-runbzr
timestamp: Wed 2007-07-04 18:49:15 +1000
message:
Remove unnecessary retcode=0 to run_bzr calls
modified:
bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
=== modified file 'bzrlib/tests/blackbox/test_add.py'
--- a/bzrlib/tests/blackbox/test_add.py 2007-07-04 08:46:22 +0000
+++ b/bzrlib/tests/blackbox/test_add.py 2007-07-04 08:49:15 +0000
@@ -29,7 +29,7 @@
self.run_bzr('init')
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt', 'CVS'])
self.build_tree_contents([('.bzrignore', 'CVS\n')])
- out = self.run_bzr('add', retcode=0)[0]
+ out = self.run_bzr('add')[0]
# the ordering is not defined at the moment
results = sorted(out.rstrip('\n').split('\n'))
self.assertEquals(['If you wish to add some of these files, please'\
@@ -40,7 +40,7 @@
'added top.txt',
'ignored 1 file(s).'],
results)
- out = self.run_bzr('add -v', retcode=0)[0]
+ out = self.run_bzr('add -v')[0]
results = sorted(out.rstrip('\n').split('\n'))
self.assertEquals(['If you wish to add some of these files, please'\
' add them by name.',
@@ -51,7 +51,7 @@
"""add -q does not print the names of added files."""
self.run_bzr('init')
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
- out = self.run_bzr('add -q', retcode=0)[0]
+ out = self.run_bzr('add -q')[0]
# the ordering is not defined at the moment
results = sorted(out.rstrip('\n').split('\n'))
self.assertEquals([''], results)
=== modified file 'bzrlib/tests/blackbox/test_diff.py'
--- a/bzrlib/tests/blackbox/test_diff.py 2007-06-27 19:13:50 +0000
+++ b/bzrlib/tests/blackbox/test_diff.py 2007-07-04 08:49:15 +0000
@@ -179,7 +179,7 @@
'update file once more', 'branch2'])
out, err = self.run_bzr('diff -r revno:1:branch2..revno:1:branch1',
- retcode=0)
+ )
self.assertEquals('', err)
self.assertEquals('', out)
out, err = self.run_bzr('diff -r revno:2:branch2..revno:1:branch1',
=== modified file 'bzrlib/tests/blackbox/test_selftest.py'
--- a/bzrlib/tests/blackbox/test_selftest.py 2007-06-27 19:13:50 +0000
+++ b/bzrlib/tests/blackbox/test_selftest.py 2007-07-04 08:49:15 +0000
@@ -433,7 +433,7 @@
"""
process = self.start_bzr_subprocess(['--versionn'])
self.assertRaises(self.failureException, self.finish_bzr_subprocess,
- process, retcode=0)
+ process)
def test_start_and_stop_bzr_subprocess_send_signal(self):
"""finish_bzr_subprocess raises self.failureException if the retcode is
@@ -461,7 +461,7 @@
class TestRunBzrError(ExternalBase):
def test_run_bzr_error(self):
- out, err = self.run_bzr_error(['^$'], ['rocks'], retcode=0)
+ out, err = self.run_bzr_error(['^$'], ['rocks'])
self.assertEqual(out, 'It sure does!\n')
out, err = self.run_bzr_error(["bzr: ERROR: foobarbaz is not versioned"],
=== modified file 'bzrlib/tests/blackbox/test_serve.py'
--- a/bzrlib/tests/blackbox/test_serve.py 2007-04-13 05:48:30 +0000
+++ b/bzrlib/tests/blackbox/test_serve.py 2007-07-04 08:49:15 +0000
@@ -44,7 +44,7 @@
process.stdin.close()
# Hide stdin from the subprocess module, so it won't fail to close it.
process.stdin = None
- result = self.finish_bzr_subprocess(process, retcode=0)
+ result = self.finish_bzr_subprocess(process)
self.assertEqual('', result[0])
self.assertEqual('', result[1])
More information about the bazaar-commits
mailing list