← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_testament.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_testament.py
30
30
 
31
31
    def test_testament_command(self):
32
32
        """Testament containing a file and a directory."""
33
 
        out, err = self.run_bzr('testament', '--long')
 
33
        out, err = self.run_bzr('testament --long')
34
34
        self.assertEqualDiff(err, '')
35
35
        self.assertEqualDiff(out, REV_2_TESTAMENT)
36
36
 
37
37
    def test_testament_command_2(self):
38
38
        """Command getting short testament of previous version."""
39
 
        out, err = self.run_bzr('testament', '-r1')
 
39
        out, err = self.run_bzr('testament -r1')
40
40
        self.assertEqualDiff(err, '')
41
41
        self.assertEqualDiff(out, REV_1_SHORT)
42
42
 
43
43
    def test_testament_command_3(self):
44
44
        """Command getting short testament of previous version."""
45
 
        out, err = self.run_bzr('testament', '-r1', '--strict')
 
45
        out, err = self.run_bzr('testament -r1 --strict')
46
46
        self.assertEqualDiff(err, '')
47
47
        self.assertEqualDiff(out, REV_1_SHORT_STRICT)
48
48