← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_selftest.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_selftest.py
113
113
 
114
114
    def test_args(self):
115
115
        """Test that run_bzr passes args correctly to _run_bzr_core"""
116
 
        ## self.callDeprecated(
117
 
        ##         ['passing varargs to run_bzr was deprecated in version 0.18.'],
118
 
        ##         self.run_bzr,
119
 
        ##         'arg1', 'arg2', 'arg3', retcode=1)
120
 
        self.run_bzr('arg1', 'arg2', 'arg3', retcode=1)
 
116
        self.callDeprecated(
 
117
                ['passing varargs to run_bzr was deprecated in version 0.18.'],
 
118
                self.run_bzr,
 
119
                'arg1', 'arg2', 'arg3', retcode=1)
121
120
        self.assertEqual(['arg1', 'arg2', 'arg3'], self.argv)
122
121
 
123
122
    def test_encoding(self):