/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_help.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_help.py
35
35
 
36
36
    def test_help_topics(self):
37
37
        """Smoketest for 'bzr help topics'"""
38
 
        out, err = self.run_bzr('help', 'topics')
 
38
        out, err = self.run_bzr('help topics')
39
39
        self.assertContainsRe(out, 'basic')
40
40
        self.assertContainsRe(out, 'topics')
41
41
        self.assertContainsRe(out, 'commands')
43
43
 
44
44
    def test_help_revisionspec(self):
45
45
        """Smoke test for 'bzr help revisionspec'"""
46
 
        out, err = self.run_bzr('help', 'revisionspec')
 
46
        out, err = self.run_bzr('help revisionspec')
47
47
        self.assertContainsRe(out, 'revno:')
48
48
        self.assertContainsRe(out, 'date:')
49
49
        self.assertContainsRe(out, 'revid:')
60
60
        
61
61
    def test_help_urlspec(self):
62
62
        """Smoke test for 'bzr help urlspec'"""
63
 
        out, err = self.run_bzr('help', 'urlspec')
 
63
        out, err = self.run_bzr('help urlspec')
64
64
        self.assertContainsRe(out, 'aftp://')
65
65
        self.assertContainsRe(out, 'bzr://')
66
66
        self.assertContainsRe(out, 'bzr\+ssh://')