← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_re_sign.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_re_sign.py
67
67
        repo = wt.branch.repository
68
68
 
69
69
        self.monkey_patch_gpg()
70
 
        self.run_bzr('re-sign', '-r', 'revid:A')
 
70
        self.run_bzr('re-sign -r revid:A')
71
71
 
72
72
        self.assertEqualSignature(repo, 'A')
73
73
 
74
 
        self.run_bzr('re-sign', 'B')
 
74
        self.run_bzr('re-sign B')
75
75
        self.assertEqualSignature(repo, 'B')
76
76
            
77
77
    def test_resign_range(self):
79
79
        repo = wt.branch.repository
80
80
 
81
81
        self.monkey_patch_gpg()
82
 
        self.run_bzr('re-sign', '-r', '1..')
 
82
        self.run_bzr('re-sign -r 1..')
83
83
        self.assertEqualSignature(repo, 'A')
84
84
        self.assertEqualSignature(repo, 'B')
85
85
        self.assertEqualSignature(repo, 'C')
89
89
        repo = wt.branch.repository
90
90
 
91
91
        self.monkey_patch_gpg()
92
 
        self.run_bzr('re-sign', 'A', 'B', 'C')
 
92
        self.run_bzr('re-sign A B C')
93
93
        self.assertEqualSignature(repo, 'A')
94
94
        self.assertEqualSignature(repo, 'B')
95
95
        self.assertEqualSignature(repo, 'C')