Rev 2745: Fix up calls to run_bzr from test_cat in http://sourcefrog.net/bzr/test-cleanup

[Martin Pool]

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

------------------------------------------------------------
revno: 2745
revision-id: mbp at sourcefrog.net-20070904032359-tngyoyokezr23rcs
parent: d.m.watkins at warwick.ac.uk-20070830100731-ie6j2bpvwjjb2ci8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: test-cleanup
timestamp: Tue 2007-09-04 13:23:59 +1000
message:
  Fix up calls to run_bzr from test_cat
modified:
  bzrlib/tests/blackbox/test_cat.py test_cat.py-20051201162916-f0937e4e19ea24b3
=== modified file 'bzrlib/tests/blackbox/test_cat.py'
--- a/bzrlib/tests/blackbox/test_cat.py	2007-08-30 10:07:31 +0000
+++ b/bzrlib/tests/blackbox/test_cat.py	2007-09-04 03:23:59 +0000
@@ -31,36 +31,39 @@
         tree.add('a')
         os.chdir('branch')
         # 'bzr cat' without an option should cat the last revision
-        self.run_bzr('cat', 'a', retcode=3)
+        self.run_bzr(['cat', 'a'], retcode=3)
 
         tree.commit(message='1')
         self.build_tree_contents([('a', 'baz\n')])
 
         # We use run_bzr_subprocess rather than run_bzr here so that we can
         # test mangling of line-endings on Windows.
-        self.assertEquals(self.run_bzr_subprocess('cat', 'a')[0], 'foo\n')
+        self.assertEquals(self.run_bzr_subprocess(['cat', 'a'])[0], 'foo\n')
 
         tree.commit(message='2')
-        self.assertEquals(self.run_bzr_subprocess('cat', 'a')[0], 'baz\n')
-        self.assertEquals(self.run_bzr_subprocess('cat', 'a', '-r', '1')[0],
-                                                  'foo\n')
-        self.assertEquals(self.run_bzr_subprocess('cat', 'a', '-r', '-1')[0],
-                                                  'baz\n')
+        self.assertEquals(self.run_bzr_subprocess(['cat', 'a'])[0], 'baz\n')
+        self.assertEquals(self.run_bzr_subprocess(
+            ['cat', 'a', '-r', '1'])[0],
+            'foo\n')
+        self.assertEquals(self.run_bzr_subprocess(
+            ['cat', 'a', '-r', '-1'])[0],
+            'baz\n')
 
         rev_id = tree.branch.last_revision()
 
-        self.assertEquals(self.run_bzr_subprocess('cat', 'a', '-r',
-                                                  'revid:%s' % rev_id)[0],
-                                                  'baz\n')
+        self.assertEquals(self.run_bzr_subprocess(
+            ['cat', 'a', '-r', 'revid:%s' % rev_id])[0],
+            'baz\n')
 
         os.chdir('..')
 
-        self.assertEquals(self.run_bzr_subprocess('cat', 'branch/a', '-r',
-                                                  'revno:1:branch')[0],
-                                                  'foo\n')
-        self.run_bzr('cat', 'a', retcode=3)
-        self.run_bzr('cat', 'a', '-r', 'revno:1:branch-that-does-not-exist',
-                     retcode=3)
+        self.assertEquals(self.run_bzr_subprocess(
+            ['cat', 'branch/a', '-r', 'revno:1:branch'])[0],
+            'foo\n')
+        self.run_bzr(['cat', 'a'], retcode=3)
+        self.run_bzr(
+                ['cat', 'a', '-r', 'revno:1:branch-that-does-not-exist'],
+                retcode=3)
 
     def test_cat_different_id(self):
         """'cat' works with old and new files"""