Rev 549: Cleanup blackbox test following recent Martin's patch (bzr.dev at 2555). in file:///v/home/vila/src/plugins/bzrtools/
Vincent Ladeuil
v.ladeuil+lp at free.fr
Wed Jun 27 16:30:19 BST 2007
At file:///v/home/vila/src/plugins/bzrtools/
------------------------------------------------------------
revno: 549
revision-id: v.ladeuil+lp at free.fr-20070627153017-fral41kaukktu038
parent: abentley at panoramicfeedback.com-20070619163220-eo0wa27sqa3ln37e
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzrtools
timestamp: Wed 2007-06-27 17:30:17 +0200
message:
Cleanup blackbox test following recent Martin's patch (bzr.dev at 2555).
modified:
tests/blackbox.py blackbox.py-20051024040435-607c5e197ca2b9d8
tests/shelf_tests.py tests.py-20051019130958-0edcded95321bddd
-------------- next part --------------
=== modified file 'tests/blackbox.py'
--- a/tests/blackbox.py 2007-01-15 15:19:20 +0000
+++ b/tests/blackbox.py 2007-06-27 15:30:17 +0000
@@ -7,109 +7,109 @@
file(filename, 'wb').write('')
def test_clean_tree(self):
- self.runbzr('init')
- self.runbzr('ignore *~')
- self.runbzr('ignore *.pyc')
+ self.run_bzr('init')
+ self.run_bzr('ignore *~')
+ self.run_bzr('ignore *.pyc')
self.touch('name')
self.touch('name~')
assert os.path.lexists('name~')
self.touch('name.pyc')
- self.runbzr('clean-tree')
+ self.run_bzr('clean-tree')
assert os.path.lexists('name~')
assert not os.path.lexists('name')
self.touch('name')
- self.runbzr('clean-tree --detritus')
+ self.run_bzr('clean-tree --detritus')
assert os.path.lexists('name')
assert not os.path.lexists('name~')
assert os.path.lexists('name.pyc')
- self.runbzr('clean-tree --ignored')
+ self.run_bzr('clean-tree --ignored')
assert os.path.lexists('name')
assert not os.path.lexists('name.pyc')
- self.runbzr('clean-tree --unknown')
+ self.run_bzr('clean-tree --unknown')
assert not os.path.lexists('name')
self.touch('name')
self.touch('name~')
self.touch('name.pyc')
- self.runbzr('clean-tree --unknown --ignored')
+ self.run_bzr('clean-tree --unknown --ignored')
assert not os.path.lexists('name')
assert not os.path.lexists('name~')
assert not os.path.lexists('name.pyc')
def test_shelve(self):
- self.runbzr('init')
- self.runbzr('commit -m uc --unchanged')
- self.runbzr('shelve -r 1 -m foo --all', retcode=3)
+ self.run_bzr('init')
+ self.run_bzr('commit -m uc --unchanged')
+ self.run_bzr('shelve -r 1 -m foo --all', retcode=3)
file('foo', 'wb').write('foo')
- self.runbzr('add foo')
- self.runbzr('commit -m foo')
- self.runbzr('shelve -r 1 -m foo --all', retcode=0)
+ self.run_bzr('add foo')
+ self.run_bzr('commit -m foo')
+ self.run_bzr('shelve -r 1 -m foo --all', retcode=0)
def test_fetch_ghosts(self):
- self.runbzr('init')
- self.runbzr('fetch-ghosts .')
+ self.run_bzr('init')
+ self.run_bzr('fetch-ghosts .')
def test_patch(self):
- self.runbzr('init')
+ self.run_bzr('init')
file('myfile', 'wb').write('hello')
- self.runbzr('add')
- self.runbzr('commit -m hello')
+ self.run_bzr('add')
+ self.run_bzr('commit -m hello')
file('myfile', 'wb').write('goodbye')
- file('mypatch', 'wb').write(self.runbzr('diff', retcode=1, backtick=1))
- self.runbzr('revert')
+ file('mypatch', 'wb').write(self.run_bzr('diff', retcode=1)[0])
+ self.run_bzr('revert')
assert file('myfile', 'rb').read() == 'hello'
- self.runbzr('patch --silent mypatch')
+ self.run_bzr('patch --silent mypatch')
assert file('myfile', 'rb').read() == 'goodbye'
def test_branch_history(self):
- self.runbzr('init')
+ self.run_bzr('init')
file('myfile', 'wb').write('hello')
- self.runbzr('add')
- self.runbzr('commit -m hello')
- self.runbzr('branch-history')
+ self.run_bzr('add')
+ self.run_bzr('commit -m hello')
+ self.run_bzr('branch-history')
def test_branch_history(self):
- self.runbzr('init')
+ self.run_bzr('init')
file('myfile', 'wb').write('hello')
- self.runbzr('add')
- self.runbzr('commit -m hello')
- self.runbzr('graph-ancestry . graph.dot')
- self.runbzr('branch . my_branch')
- self.runbzr('graph-ancestry . graph.dot --merge-branch my_branch')
+ self.run_bzr('add')
+ self.run_bzr('commit -m hello')
+ self.run_bzr('graph-ancestry . graph.dot')
+ self.run_bzr('branch . my_branch')
+ self.run_bzr('graph-ancestry . graph.dot --merge-branch my_branch')
def test_fetch_ghosts(self):
- self.runbzr('init')
+ self.run_bzr('init')
file('myfile', 'wb').write('hello')
- self.runbzr('add')
- self.runbzr('commit -m hello')
- self.runbzr('branch . my_branch')
- self.runbzr('fetch-ghosts my_branch')
+ self.run_bzr('add')
+ self.run_bzr('commit -m hello')
+ self.run_bzr('branch . my_branch')
+ self.run_bzr('fetch-ghosts my_branch')
def test_zap(self):
- self.runbzr('init source')
- self.runbzr('checkout --lightweight source checkout')
- self.runbzr('zap checkout')
+ self.run_bzr('init source')
+ self.run_bzr('checkout --lightweight source checkout')
+ self.run_bzr('zap checkout')
self.assertIs(False, os.path.exists('checkout'))
self.assertIs(True, os.path.exists('source'))
def test_zap_branch(self):
- self.runbzr('init source')
- self.runbzr('checkout --lightweight source checkout')
- self.runbzr('zap --branch checkout', retcode=3)
+ self.run_bzr('init source')
+ self.run_bzr('checkout --lightweight source checkout')
+ self.run_bzr('zap --branch checkout', retcode=3)
self.assertIs(True, os.path.exists('checkout'))
self.assertIs(True, os.path.exists('source'))
- self.runbzr('branch source source2')
- self.runbzr('checkout --lightweight source2 checkout2')
- self.runbzr('zap --branch checkout2')
+ self.run_bzr('branch source source2')
+ self.run_bzr('checkout --lightweight source2 checkout2')
+ self.run_bzr('zap --branch checkout2')
self.assertIs(False, os.path.exists('checkout2'))
self.assertIs(False, os.path.exists('source2'))
def test_branches(self):
- self.runbzr('init source')
- self.runbzr('init source/subsource')
- self.runbzr('checkout --lightweight source checkout')
- self.runbzr('init checkout/subcheckout')
- self.runbzr('init checkout/.bzr/subcheckout')
- out = self.capture('branches')
+ self.run_bzr('init source')
+ self.run_bzr('init source/subsource')
+ self.run_bzr('checkout --lightweight source checkout')
+ self.run_bzr('init checkout/subcheckout')
+ self.run_bzr('init checkout/.bzr/subcheckout')
+ out = self.run_bzr('branches')[0]
lines = out.split('\n')
self.assertIs(True, 'source' in lines)
self.assertIs(True, 'source/subsource' in lines)
@@ -118,34 +118,34 @@
self.assertIs(True, 'checkout/.bzr/subcheckout' not in lines)
def test_import_upstream(self):
- self.runbzr('init source')
+ self.run_bzr('init source')
os.mkdir('source/src')
f = file('source/src/myfile', 'wb')
f.write('hello?')
f.close()
os.chdir('source')
- self.runbzr('add')
- self.runbzr('commit -m hello')
- self.runbzr('export ../source-0.1.tar.gz')
- self.runbzr('export ../source-0.1.tar.bz2')
- self.runbzr('export ../source-0.1')
- self.runbzr('init ../import')
+ self.run_bzr('add')
+ self.run_bzr('commit -m hello')
+ self.run_bzr('export ../source-0.1.tar.gz')
+ self.run_bzr('export ../source-0.1.tar.bz2')
+ self.run_bzr('export ../source-0.1')
+ self.run_bzr('init ../import')
os.chdir('../import')
- self.runbzr('import ../source-0.1.tar.gz')
+ self.run_bzr('import ../source-0.1.tar.gz')
self.failUnlessExists('src/myfile')
- result = self.runbzr('import ../source-0.1.tar.gz', retcode=3)[1]
+ result = self.run_bzr('import ../source-0.1.tar.gz', retcode=3)[1]
self.assertContainsRe(result, 'Working tree has uncommitted changes')
- self.runbzr('commit -m commit')
- self.runbzr('import ../source-0.1.tar.gz')
+ self.run_bzr('commit -m commit')
+ self.run_bzr('import ../source-0.1.tar.gz')
os.chdir('..')
- self.runbzr('init import2')
- self.runbzr('import source-0.1.tar.gz import2')
+ self.run_bzr('init import2')
+ self.run_bzr('import source-0.1.tar.gz import2')
self.failUnlessExists('import2/src/myfile')
- self.runbzr('import source-0.1.tar.gz import3')
+ self.run_bzr('import source-0.1.tar.gz import3')
self.failUnlessExists('import3/src/myfile')
- self.runbzr('import source-0.1.tar.bz2 import4')
+ self.run_bzr('import source-0.1.tar.bz2 import4')
self.failUnlessExists('import4/src/myfile')
- self.runbzr('import source-0.1 import5')
+ self.run_bzr('import source-0.1 import5')
self.failUnlessExists('import5/src/myfile')
def test_suite():
=== modified file 'tests/shelf_tests.py'
--- a/tests/shelf_tests.py 2007-06-12 20:35:41 +0000
+++ b/tests/shelf_tests.py 2007-06-27 15:30:17 +0000
@@ -49,7 +49,7 @@
'new_date': new_date}
hdr = self.DIFF_HEADER % keys
diff = diff % keys
- self.assertEqual(self.capture('diff', retcode=1), hdr + diff + '\n')
+ self.assertEqual(self.run_bzr('diff', retcode=1)[0], hdr + diff + '\n')
def _check_shelf(self, idx, diff=DIFF_1, filename='test_file',
new_date=None):
@@ -95,10 +95,10 @@
self.tree.unlock()
# Shelve the changes
- self.run_bzr('shelve', '--all', retcode=0)
+ self.run_bzr('shelve --all', retcode=0)
# Make sure there is no diff anymore
- self.assertEqual(self.capture('diff', retcode=0), '')
+ self.assertEqual(self.run_bzr('diff', retcode=0)[0], '')
# Make sure the file is actually back the way it was
self.assertEqual(file('test_file').read(), self.ORIGINAL)
@@ -106,7 +106,7 @@
self._check_shelf('00', new_date=new_date)
# Unshelve
- self.run_bzr('unshelve', '--all', retcode=0)
+ self.run_bzr('unshelve --all', retcode=0)
self._check_diff()
@@ -122,7 +122,7 @@
self.__create_and_add_test_file()
# Shelve the changes
- self.run_bzr('shelve', '--all', retcode=3)
+ self.run_bzr('shelve --all', retcode=3)
if os.path.exists(os.path.join(self.tree.branch.base,
'.shelf/shelves/default/00')):
@@ -146,7 +146,7 @@
self.tree.commit(message='update test_file')
# Shelve the changes
- self.run_bzr('shelve', '--all', '-r', '1', retcode=0)
+ self.run_bzr('shelve --all -r 1', retcode=0)
self._check_diff(self.DIFF_2)
@@ -154,7 +154,7 @@
self.assertEqual(file('test_file').read(), self.ORIGINAL)
# Unshelve
- self.run_bzr('unshelve', '--all', retcode=0)
+ self.run_bzr('unshelve --all', retcode=0)
# Make sure the file is back the way it should be
self.assertEqual(file('test_file').read(), self.MODIFIED)
@@ -162,8 +162,7 @@
def test_shelf_with_two_revisions(self):
self.tree = self.make_branch_and_tree('.')
- cmd = 'shelve --all -r 1..2'
- (stdout, stderr) = self.run_bzr_captured(cmd.split(), retcode=None)
+ stdout, stderr = self.run_bzr('shelve --all -r 1..2', retcode=None)
self.assertEqual(stderr.split('\n')[0],
'bzr: ERROR: shelve only accepts a single revision parameter.')
@@ -178,10 +177,10 @@
self.build_tree_contents([('test_file', 'patch %s\n' % patch)])
# Shelve the changes
- self.run_bzr('shelve', '--all', retcode=0)
+ self.run_bzr('shelve --all', retcode=0)
# Make sure there is no diff anymore
- self.assertEqual(self.capture('diff', retcode=0), '')
+ self.assertEqual(self.run_bzr('diff', retcode=0)[0], '')
# Check the shelf is right
shelf = open(os.path.join(self.tree.basedir,
@@ -189,7 +188,7 @@
self.assertTrue('patch %s' % patch in shelf)
# Check the shown output is right
- shown = self.capture('shelf show %s' % patch, retcode=0)
+ shown = self.run_bzr('shelf show %s' % patch, retcode=0)[0]
self.assertEqual(shown, shelf)
def test_shelf_show_multi(self):
@@ -205,7 +204,7 @@
self.assertTrue('patch 00' in shelf)
# Check the shown output is right
- shown = self.capture('shelf show 00', retcode=0)
+ shown = self.run_bzr('shelf show 00', retcode=0)[0]
self.assertEqual(shown, shelf)
def test_shelf_show_unspecified(self):
@@ -221,12 +220,12 @@
self.assertTrue('patch 02' in shelf)
# Check the shown output is right
- shown = self.capture('shelf show', retcode=0)
+ shown = self.run_bzr('shelf show', retcode=0)[0]
self.assertEqual(shown, shelf)
def test_shelf_show_with_no_patch(self):
self.tree = self.make_branch_and_tree('.')
- stderr = self.run_bzr_captured(['shelf', 'show', '00'], retcode=None)[1]
+ stderr = self.run_bzr('shelf show 00', retcode=None)[1]
self.assertTrue("Patch '00' doesn't exist on shelf default!" in stderr)
def test_shelf_unshelve_failure(self):
@@ -238,7 +237,7 @@
file('test_file', 'w').write(self.MODIFIED)
# Shelve the changes
- self.run_bzr('shelve', '--all', retcode=0)
+ self.run_bzr('shelve --all', retcode=0)
# Write an unapplyable patch into the shelf
shelf = open(os.path.join(self.tree.basedir,
@@ -247,7 +246,7 @@
shelf.close()
# Unshelve, should fail
- self.run_bzr('unshelve', '--all', retcode=3)
+ self.run_bzr('unshelve --all', retcode=3)
# Make sure the patch is still there, eventhough it's broken
shelf = open(os.path.join(self.tree.basedir,
@@ -255,7 +254,7 @@
self.assertEqual(shelf, self.DIFF_2)
# Working tree should be unchanged
- diff = self.capture('diff', retcode=0)
+ diff = self.run_bzr('diff', retcode=0)[0]
self.assertEqual(diff, '')
def test_shelf_unshelve_failure_two_hunks(self):
@@ -269,21 +268,21 @@
file('test_file2', 'w').write(self.MODIFIED)
# Shelve the changes
- self.run_bzr('shelve', '--all', retcode=0)
+ self.run_bzr('shelve --all', retcode=0)
# Put the changes to test_file back, the shelved patch won't apply now
file('test_file', 'w').write(self.MODIFIED)
self.tree.commit(message='screw up test_file')
# Unshelve, should fail
- self.run_bzr('unshelve', '--all', retcode=3)
+ self.run_bzr('unshelve --all', retcode=3)
# Working tree should be unchanged
- diff = self.capture('diff', retcode=0)
+ diff = self.run_bzr('diff', retcode=0)[0]
self.assertEqual(diff, '')
# Force should succeed and modify test_file2, but leave shelf
- self.run_bzr('unshelve', '--force', '--all', retcode=0)
+ self.run_bzr('unshelve --force --all', retcode=0)
self.assertEqual(open('test_file2').read(), self.MODIFIED)
self.assertTrue(os.path.exists('.shelf/shelves/default/00'))
@@ -298,23 +297,23 @@
file('test_file2', 'w').write(self.MODIFIED)
# Shelve the changes
- self.run_bzr('shelve', '--all', 'test_file', retcode=0)
- self.run_bzr('shelve', '--all', 'test_file2', retcode=0)
+ self.run_bzr('shelve --all test_file', retcode=0)
+ self.run_bzr('shelve --all test_file2', retcode=0)
# Unshelve
- self.run_bzr('unshelve', '--all', retcode=0)
+ self.run_bzr('unshelve --all', retcode=0)
# We should now have 00 and 01~
self.assertTrue(os.path.exists('.shelf/shelves/default/00'))
self.assertTrue(os.path.exists('.shelf/shelves/default/01~'))
# Check ls works
- lines = self.capture('shelf ls', retcode=0).split('\n')
+ lines = self.run_bzr('shelf ls', retcode=0)[0].split('\n')
for line in lines:
self.assertFalse(line.startswith(' 01'))
# Unshelve, if unshelve is confused by the backup it will fail
- self.run_bzr('unshelve', '--all', retcode=0)
+ self.run_bzr('unshelve --all', retcode=0)
def test_shelf_delete(self):
self.tree = self.make_branch_and_tree('.')
@@ -337,13 +336,13 @@
self.tree.unlock()
# Shelve the changes
- self.run_bzr('shelve', '--all', 'test_file', retcode=0)
- self.run_bzr('shelve', '--all', 'test_file2', retcode=0)
+ self.run_bzr('shelve --all test_file', retcode=0)
+ self.run_bzr('shelve --all test_file2', retcode=0)
self._check_shelf('00', new_date=new_date)
# Delete 00
- self.run_bzr('shelf', 'delete', '00', retcode=0)
+ self.run_bzr('shelf delete 00', retcode=0)
# We should now have 01 but not 00, but we should have 00~
self.assertFalse(os.path.exists('.shelf/shelves/default/00'))
@@ -354,28 +353,28 @@
self._check_shelf('00~', new_date=new_date)
# Check ls works
- lines = self.capture('shelf ls', retcode=0).split('\n')
+ lines = self.run_bzr('shelf ls', retcode=0)[0].split('\n')
for line in lines:
self.assertFalse(line.startswith(' 00'))
# Unshelve should unshelve 01
- self.run_bzr('unshelve', '--all', retcode=0)
+ self.run_bzr('unshelve --all', retcode=0)
self.assertEqual(file('test_file2').read(), self.MODIFIED)
def test_shelf_gaps(self):
self.tree = self.make_branch_and_tree('.')
self.__create_and_add_test_file()
file('test_file', 'w').write(self.MODIFIED)
- self.run_bzr('shelve', '--all', 'test_file', retcode=0)
+ self.run_bzr('shelve --all test_file', retcode=0)
file('test_file', 'w').write(self.MODIFIED)
- self.run_bzr('shelve', '--all', 'test_file', retcode=0)
+ self.run_bzr('shelve --all test_file', retcode=0)
# Now delete 00, leaving 01, next shelve should go into 02
- self.run_bzr('shelf', 'delete', '0', retcode=0)
+ self.run_bzr('shelf delete 0', retcode=0)
self.assertFalse(os.path.exists('.shelf/shelves/default/00'))
self.assertFalse(os.path.exists('.shelf/shelves/default/02'))
file('test_file', 'w').write(self.MODIFIED)
- self.run_bzr('shelve', '--all', 'test_file', retcode=0)
+ self.run_bzr('shelve --all test_file', retcode=0)
self.assertFalse(os.path.exists('.shelf/shelves/default/00'))
self.assertTrue(os.path.exists('.shelf/shelves/default/02'))
@@ -386,7 +385,7 @@
# Modify then shelve, so we're not upgrading to 00, just for kicks
file('test_file', 'w').write(self.MODIFIED)
- self.run_bzr('shelve', '--all', 'test_file', retcode=0)
+ self.run_bzr('shelve --all test_file', retcode=0)
open('.bzr-shelf', 'w').write('First old shelf')
open('.bzr-shelf-1', 'w').write('Second old shelf')
@@ -394,14 +393,14 @@
# shelve and unshelve should bitch and do nothing
file('test_file', 'w').write('blah blah blah')
- self.run_bzr('shelve', '--all', retcode=3)
+ self.run_bzr('shelve --all', retcode=3)
self.assertFalse(os.path.exists('.shelf/shelves/default/01'))
self.assertEqual(file('test_file').read(), 'blah blah blah')
- self.run_bzr('unshelve', '--all', retcode=3)
+ self.run_bzr('unshelve --all', retcode=3)
self.assertTrue(os.path.exists('.shelf/shelves/default/00'))
# Upgrade, make sure it worked
- self.run_bzr('shelf', 'upgrade', retcode=0)
+ self.run_bzr('shelf upgrade', retcode=0)
self.assertEqual(open('.shelf/shelves/default/01').read(),
'First old shelf')
self.assertEqual(open('.shelf/shelves/default/02').read(),
@@ -418,7 +417,7 @@
self.assertFalse(os.path.exists('.bzr-shelf-3'))
# Shelve should work now
- self.run_bzr('shelve', '--all', retcode=0)
+ self.run_bzr('shelve --all', retcode=0)
def test_shelf_p1_patch(self):
self.tree = self.make_branch_and_tree('.')
@@ -426,7 +425,7 @@
self.__create_and_add_test_file()
# Run a benign shelf command to setup .shelf for us
- self.run_bzr('shelf', 'ls', retcode=0)
+ self.run_bzr('shelf ls', retcode=0)
old_tree = self.tree.basis_tree()
old_tree.lock_read()
@@ -448,7 +447,7 @@
open('.shelf/shelves/default/00', 'w').write(diff)
# This should work
- self.run_bzr('unshelve', '--all', retcode=0)
+ self.run_bzr('unshelve --all', retcode=0)
self._check_diff()
@@ -469,23 +468,23 @@
f.close()
# Shelve the changes
- self.run_bzr('shelve', '--all', retcode=0)
+ self.run_bzr('shelve --all', retcode=0)
# Working tree should be unchanged
- diff = self.capture('diff', retcode=0)
+ diff = self.run_bzr('diff', retcode=0)[0]
self.assertEqual(diff, '')
# Unshelve, should succeed
- self.run_bzr('unshelve', '--all', retcode=0)
+ self.run_bzr('unshelve --all', retcode=0)
self._check_diff(filename='subdir/test_file')
# Make sure relative filenames work ok
- self.run_bzr('shelve', 'test_file', '--all', retcode=0)
+ self.run_bzr('shelve test_file --all', retcode=0)
def test_shelf_shelf_bogus_subcommand(self):
self.tree = self.make_branch_and_tree('.')
- self.run_bzr('shelf', 'foo', retcode=3) # <- retcode == 3
+ self.run_bzr('shelf foo', retcode=3) # <- retcode == 3
def test_shelf_OOO_unshelve(self):
self.tree = self.make_branch_and_tree('.')
@@ -499,7 +498,7 @@
# Shelve the changes
for i in range(1, 5):
- self.run_bzr('shelve', '--all', 'test_file%d' % i, retcode=0)
+ self.run_bzr(['shelve', '--all', 'test_file%d' % i], retcode=0)
# Check shelving worked
for i in range(1, 5):
@@ -510,31 +509,31 @@
self.assertTrue(os.path.exists('.shelf/shelves/default/0%d' % i))
# Unshelve 00
- self.run_bzr('unshelve', '--all', '00', retcode=0)
+ self.run_bzr('unshelve --all 00', retcode=0)
self.assertEqual(file('test_file1').read(), self.MODIFIED)
# Check ls works
- lines = self.capture('shelf ls', retcode=0).split('\n')
+ lines = self.run_bzr('shelf ls', retcode=0)[0].split('\n')
for line in lines:
self.assertFalse(line.startswith(' 00'))
# Check we can reshelve once we've unshelved out of order, should be 04
self.assertFalse(os.path.exists('.shelf/shelves/default/04'))
- self.run_bzr('shelve', '--all')
+ self.run_bzr('shelve --all')
self.assertTrue(os.path.exists('.shelf/shelves/default/04'))
# Check ls works
- text = self.capture('shelf ls', retcode=0)
+ text = self.run_bzr('shelf ls', retcode=0)[0]
for line in text.split('\n'):
self.assertFalse(line.startswith(' 00'))
# We now have 01,02,03,04
# Unshelve 02
- self.run_bzr('unshelve', '--all', '02', retcode=0)
+ self.run_bzr('unshelve --all 02', retcode=0)
self.assertEqual(file('test_file3').read(), self.MODIFIED)
# Unshelve the default, this is the reshelved 00, hence modifies file 1
- self.run_bzr('unshelve', '--all', retcode=0)
+ self.run_bzr('unshelve --all', retcode=0)
self.assertEqual(file('test_file1').read(), self.MODIFIED)
def test_shelf_switch_basic(self):
@@ -543,12 +542,12 @@
# This should go to "default"
file('test_file', 'w').write(self.MODIFIED)
- self.run_bzr('shelve', '--all', 'test_file', retcode=0)
+ self.run_bzr('shelve --all test_file', retcode=0)
# Switch to "other"
- self.run_bzr('shelf', 'switch', 'other', retcode=0)
+ self.run_bzr('shelf switch other', retcode=0)
file('test_file', 'w').write(self.MODIFIED)
- self.run_bzr('shelve', '--all', 'test_file', retcode=0)
+ self.run_bzr('shelve --all test_file', retcode=0)
# Check it worked
self.assertTrue(os.path.exists('.shelf/shelves/default/00'))
@@ -556,9 +555,9 @@
self.assertTrue(os.path.exists('.shelf/shelves/other/00'))
# Switch back
- self.run_bzr('shelf', 'switch', 'default', retcode=0)
+ self.run_bzr('shelf switch default', retcode=0)
file('test_file', 'w').write(self.MODIFIED)
- self.run_bzr('shelve', '--all', 'test_file', retcode=0)
+ self.run_bzr('shelve --all test_file', retcode=0)
# Check that worked
self.assertTrue(os.path.exists('.shelf/shelves/default/01'))
@@ -568,14 +567,14 @@
self.tree = self.make_branch_and_tree('.')
# Check the bad arg handling
- stdout, error = self.run_bzr_captured(['unshelve', '01'], retcode=3)
+ stdout, error = self.run_bzr('unshelve 01', retcode=3)
self.assertTrue("Patch '01' doesn't exist on shelf" in error)
- stdout, error = self.run_bzr_captured(['unshelve', 'foo'], retcode=3)
+ stdout, error = self.run_bzr('unshelve foo', retcode=3)
self.assertTrue("Invalid patch name 'foo'" in error)
# Hex and is cracky, so it shouldn't work
- stdout, error = self.run_bzr_captured(['unshelve', '0x00'], retcode=3)
+ stdout, error = self.run_bzr(['unshelve', '0x00'], retcode=3)
self.assertTrue("Invalid patch name '0x00'" in error)
def test_color_hunk_selector(self):
@@ -613,10 +612,8 @@
f = file('test_file', 'wb')
f.write(self.MODIFIED)
f.close()
- stdout, error = self.run_bzr_captured(['shelve', '--all',
- '--no-color'])
- stdout, error = self.run_bzr_captured(['unshelve', '--all',
- '--no-color'])
+ stdout, error = self.run_bzr('shelve --all --no-color')
+ stdout, error = self.run_bzr('unshelve --all --no-color')
def test_shelf_help(self):
self.assertContainsRe(cmd_shelf().help(),
More information about the bazaar-commits
mailing list