← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_checkout.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_checkout.py
80
80
            format=bzrdir.BzrDirMetaFormat1())
81
81
        # check no tree was created
82
82
        self.assertRaises(errors.NoWorkingTree, branch.bzrdir.open_workingtree)
83
 
        out, err = self.run_bzr('checkout', 'treeless-branch')
 
83
        out, err = self.run_bzr('checkout treeless-branch')
84
84
        # we should have a tree now
85
85
        branch.bzrdir.open_workingtree()
86
86
        # with no diff
87
 
        out, err = self.run_bzr('diff', 'treeless-branch')
 
87
        out, err = self.run_bzr('diff treeless-branch')
88
88
 
89
89
        # now test with no parameters
90
90
        branch = bzrdir.BzrDir.create_branch_convenience(