← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_outside_wt.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_outside_wt.py
37
37
 
38
38
    def test_url_log(self):
39
39
        url = self.get_readonly_url() + 'subdir/'
40
 
        out, err = self.run_bzr('log', 
41
 
                                url, retcode=3)
 
40
        out, err = self.run_bzr(['log', url], retcode=3)
42
41
        self.assertEqual(u'bzr: ERROR: Not a branch:'
43
42
                         u' %s\n' % url, err)
44
43
 
45
44
    def test_diff_ouside_tree(self):
46
45
        os.chdir(tempfile.mkdtemp())
47
 
        self.run_bzr('init', 'branch1')
48
 
        self.run_bzr(['commit', '-m', 'nothing', '--unchanged', 'branch1'])
49
 
        self.run_bzr(['commit', '-m', 'nothing', '--unchanged', 'branch1'])
 
46
        self.run_bzr('init branch1')
 
47
        self.run_bzr('commit -m nothing --unchanged branch1')
 
48
        self.run_bzr('commit -m nothing --unchanged branch1')
50
49
        # -r X..Y
51
50
        out, err = self.run_bzr('diff -r revno:2:branch2..revno:1', retcode=3)
52
51
        self.assertEquals('', out)
67
66
        self.assertEquals('', out)
68
67
        self.assertEqual(u'bzr: ERROR: Not a branch: %s/\n' % (getcwd(),),
69
68
                         err)
70
 
        
 
69
 
71
70