/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_lsprof.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_lsprof.py
23
23
    _test_needs_features = [test_lsprof.LSProfFeature]
24
24
 
25
25
    def test_file(self):
26
 
        out, err = self.run_bzr('--lsprof-file', 'output.callgrind', 'rocks')
 
26
        out, err = self.run_bzr('--lsprof-file output.callgrind rocks')
27
27
        self.assertNotContainsRe(out, 'Profile data written to')
28
28
        self.assertContainsRe(err, 'Profile data written to')
29
29
 
30
30
    def test_stdout(self):
31
 
        out, err = self.run_bzr('--lsprof', 'rocks')
 
31
        out, err = self.run_bzr('--lsprof rocks')
32
32
        self.assertContainsRe(out, 'CallCount')
33
33
        self.assertNotContainsRe(err, 'Profile data written to')