← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_break_lock.py

  • Committer: Vincent Ladeuil
  • Date: 2007-06-26 20:32:49 UTC
  • mto: (2581.1.1 cleanup-runbzr)
  • mto: This revision was merged to the branch mainline in revision 2588.
  • Revision ID: v.ladeuil+lp@free.fr-20070626203249-sqm4afiai5dxofum
Deprecate the varargs syntax and fix the tests.

* bzrlib/tests/__init__.py:
(TestCase.run_bzr): Activate the deprecation warning.
(TestCase.run_bzr_error): Add error_regexes to kwargs or run_bzr
get confused.

* bzrlib/tests/blackbox/test_selftest.py:
(TestRunBzr.test_args): Activate.

* bzrlib/tests/blackbox/test_inventory.py:
(TestInventory.assertInventoryEqual): Build the command from args
if not None.

* bzrlib/tests/blackbox/test_ls.py:
(TestLS.ls_equals): Build the command from args if not None.

* bzrlib/tests/blackbox/test_remove_tree.py:
(TestRemoveTree.test_remove_tree_lightweight_checkout_explicit):
Nice catch, we were calling run_bzr instead of run_bzr_error. This
went unnoticed for some time...

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_break_lock.py
64
64
        self.wt = checkoutdir.create_workingtree()
65
65
 
66
66
    def test_break_lock_help(self):
67
 
        out, err = self.run_bzr('break-lock', '--help')
 
67
        out, err = self.run_bzr('break-lock --help')
68
68
        # shouldn't fail and should not produce error output
69
69
        self.assertEqual('', err)
70
70
 
80
80
        self.master_branch.lock_write()
81
81
        # run the break-lock
82
82
        # we need 5 yes's - wt, branch, repo, bound branch, bound repo.
83
 
        self.run_bzr('break-lock', 'checkout', stdin="y\ny\ny\ny\n")
 
83
        self.run_bzr('break-lock checkout', stdin="y\ny\ny\ny\n")
84
84
        # a new tree instance should be lockable
85
85
        branch = bzrlib.branch.Branch.open('checkout')
86
86
        branch.lock_write()
98
98
    def test_break_lock_format_5_bzrdir(self):
99
99
        # break lock on a format 5 bzrdir should just return
100
100
        self.make_branch_and_tree('foo', format=bzrlib.bzrdir.BzrDirFormat5())
101
 
        out, err = self.run_bzr('break-lock', 'foo')
 
101
        out, err = self.run_bzr('break-lock foo')
102
102
        self.assertEqual('', out)
103
103
        self.assertEqual('', err)