← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_revision_history.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_revision_history.py
52
52
        """Tests 'revision_history' command with a location that is a
53
53
        repository branch."""
54
54
        self._build_branch()
55
 
        self.run_bzr('init-repo', 'repo')
56
 
        self.run_bzr('branch', 'test', 'repo/test')
 
55
        self.run_bzr('init-repo repo')
 
56
        self.run_bzr('branch test repo/test')
57
57
        self._check_revision_history('repo/test')
58
58
 
59
59
    def test_revision_history_with_checkout(self):
60
60
        """Tests 'revision_history' command with a location that is a
61
61
        checkout of a repository branch."""
62
62
        self._build_branch()
63
 
        self.run_bzr('init-repo', 'repo')
64
 
        self.run_bzr('branch', 'test', 'repo/test')
65
 
        self.run_bzr('checkout', 'repo/test', 'test-checkout')
 
63
        self.run_bzr('init-repo repo')
 
64
        self.run_bzr('branch test repo/test')
 
65
        self.run_bzr('checkout repo/test test-checkout')
66
66
        self._check_revision_history('test-checkout')
67
67
 
68
68
    def test_revision_history_with_lightweight_checkout(self):
69
69
        """Tests 'revision_history' command with a location that is a
70
70
        lightweight checkout of a repository branch."""
71
71
        self._build_branch()
72
 
        self.run_bzr('init-repo', 'repo')
73
 
        self.run_bzr('branch', 'test', 'repo/test')
74
 
        self.run_bzr('checkout', '--lightweight', 'repo/test', 'test-checkout')
 
72
        self.run_bzr('init-repo repo')
 
73
        self.run_bzr('branch test repo/test')
 
74
        self.run_bzr('checkout --lightweight repo/test test-checkout')
75
75
        self._check_revision_history('test-checkout')