[MERGE] Speed up blackbox.test_cat by 2 seconds

[Andrew Bennetts]

This bundle speeds up blackbox.test_cat.TestCat.test_cat by 2 seconds on my
laptop by avoiding unnecessary subprocesses.  This is just some low-hanging
fruit to make the test suite a small bit faster.

-Andrew.

-------------- next part --------------
# Bazaar merge directive format 1
# revision_id: andrew.bennetts at canonical.com-20070718080319-\
#   qrv6y1mni9eiju29
# target_branch: http://bazaar-vcs.org/bzr/bzr.dev
# testament_sha1: 890d275e53e8d56c4889749611d390defd37764f
# timestamp: 2007-07-18 18:03:37 +1000
# source_branch: http://people.ubuntu.com/~andrew/bzr/test_cat_tweak
# 
# Bazaar revision bundle v0.9
#
# message:
#   Speed up blackbox.test_cat.TestCat.test_cat by 2 seconds by avoiding unnecessary subprocesses.
# committer: Andrew Bennetts <andrew.bennetts at canonical.com>
# date: Wed 2007-07-18 18:03:19.490000010 +1000

=== modified file bzrlib/tests/blackbox/test_cat.py
--- bzrlib/tests/blackbox/test_cat.py
+++ bzrlib/tests/blackbox/test_cat.py
@@ -28,37 +28,37 @@
     def test_cat(self):
 
         def bzr(*args, **kwargs):
-            return self.run_bzr_subprocess(*args, **kwargs)[0]
+            return self.run_bzr(*args, **kwargs)[0]
 
         os.mkdir('branch')
         os.chdir('branch')
         bzr('init')
         open('a', 'wb').write('foo\n')
-        bzr('add', 'a')
+        bzr('add a')
 
         # 'bzr cat' without an option should cat the last revision
-        bzr('cat', 'a', retcode=3)
+        bzr('cat a', retcode=3)
 
-        bzr('commit', '-m', '1')
+        bzr('commit -m 1')
         open('a', 'wb').write('baz\n')
 
-        self.assertEquals(bzr('cat', 'a'), 'foo\n')
+        self.assertEquals(bzr('cat a'), 'foo\n')
 
-        bzr('commit', '-m', '2')
-        self.assertEquals(bzr('cat', 'a'), 'baz\n')
-        self.assertEquals(bzr('cat', 'a', '-r', '1'), 'foo\n')
-        self.assertEquals(bzr('cat', 'a', '-r', '-1'), 'baz\n')
+        bzr('commit -m 2')
+        self.assertEquals(bzr('cat a'), 'baz\n')
+        self.assertEquals(bzr('cat a -r 1'), 'foo\n')
+        self.assertEquals(bzr('cat a -r -1'), 'baz\n')
 
         rev_id = bzr('revision-history').strip().split('\n')[-1]
 
-        self.assertEquals(bzr('cat', 'a', '-r', 'revid:%s' % rev_id), 'baz\n')
+        self.assertEquals(bzr('cat a -r revid:%s' % rev_id), 'baz\n')
         
         os.chdir('..')
         
-        self.assertEquals(bzr('cat', 'branch/a', '-r', 'revno:1:branch'),
+        self.assertEquals(bzr('cat branch/a -r revno:1:branch'),
                           'foo\n')
-        bzr('cat', 'a', retcode=3)
-        bzr('cat', 'a', '-r', 'revno:1:branch-that-does-not-exist', retcode=3)
+        bzr('cat a', retcode=3)
+        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"""

=== modified directory  // last-changed:andrew.bennetts at canonical.com-200707180
... 80319-qrv6y1mni9eiju29
# revision id: andrew.bennetts at canonical.com-20070718080319-qrv6y1mni9eiju29
# sha1: 890d275e53e8d56c4889749611d390defd37764f
# inventory sha1: c518028a8595e6664e554c9861f372d91a476122
# parent ids:
#   pqm at pqm.ubuntu.com-20070717180333-5smmeduk2q3sbzvw
# base id: pqm at pqm.ubuntu.com-20070717180333-5smmeduk2q3sbzvw
# properties:
#   branch-nick: test_cat_tweak