← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_ignore.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_ignore.py
48
48
        self.run_bzr('init')
49
49
        self.run_bzr_error(('bzr: ERROR: NAME_PATTERN should not '
50
50
                            'be an absolute path\n',),
51
 
                           'ignore','/crud')
 
51
                           'ignore /crud')
52
52
        
53
53
    def test_ignore_directories(self):
54
54
        """ignoring a directory should ignore directory tree.
113
113
                           'ignore')
114
114
 
115
115
    def test_ignore_old_defaults(self):
116
 
        out, err = self.run_bzr('ignore', '--old-default-rules')
 
116
        out, err = self.run_bzr('ignore --old-default-rules')
117
117
        self.assertContainsRe(out, 'CVS')
118
118
        self.assertEqual('', err)
119
119