← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_split.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_split.py
27
27
        wt = self.make_branch_and_tree('a')
28
28
        wt.add(['b', 'b/c'])
29
29
        wt.commit('rev1')
30
 
        self.run_bzr('split', 'a/b')
31
 
        self.run_bzr_error(('.* is not versioned',), 'split', 'q')
 
30
        self.run_bzr('split a/b')
 
31
        self.run_bzr_error(('.* is not versioned',), 'split q')
32
32
 
33
33
    def test_split_repo_failure(self):
34
34
        repo = self.make_repository('branch', shared=True, format='knit')
37
37
        wt = a_branch.create_checkout('a', lightweight=True)
38
38
        wt.add(['b', 'b/c', 'b/c/d'], ['b-id', 'c-id', 'd-id'])
39
39
        wt.commit('added files')
40
 
        self.run_bzr_error(('must upgrade your branch at .*a',), 'split', 
41
 
                            'a/b')
 
40
        self.run_bzr_error(('must upgrade your branch at .*a',), 'split a/b')