← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_aliases.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_aliases.py
28
28
 
29
29
    def test_aliases(self):
30
30
 
31
 
        def bzr(*args, **kwargs):
32
 
            return self.run_bzr(*args, **kwargs)[0]
 
31
        def bzr(args, **kwargs):
 
32
            return self.run_bzr(args, **kwargs)[0]
33
33
 
34
 
        def bzr_catch_error(*args, **kwargs):
35
 
            return self.run_bzr(*args, **kwargs)[1]
 
34
        def bzr_catch_error(args, **kwargs):
 
35
            return self.run_bzr(args, **kwargs)[1]
36
36
 
37
37
 
38
38
        if os.path.isfile(config_filename()):
54
54
 
55
55
        bzr('init')
56
56
        open('a', 'wb').write(str1)
57
 
        bzr('add', 'a')
58
 
 
59
 
        bzr('commit', '-m', '1')
60
 
 
61
 
        self.assertEquals(bzr('c', 'a'), str1)
 
57
        bzr('add a')
 
58
 
 
59
        bzr('commit -m 1')
 
60
 
 
61
        self.assertEquals(bzr('c a'), str1)
62
62
 
63
63
        open('a', 'wb').write(str2)
64
 
        bzr('commit', '-m', '2')
 
64
        bzr('commit -m 2')
65
65
 
66
 
        self.assertEquals(bzr('c', 'a'), str2)
67
 
        self.assertEquals(bzr('c1', 'a'), str1)
68
 
        self.assertEquals(bzr('c1', '--revision', '2', 'a'), str2)
 
66
        self.assertEquals(bzr('c a'), str2)
 
67
        self.assertEquals(bzr('c1 a'), str1)
 
68
        self.assertEquals(bzr('c1 --revision 2 a'), str2)
69
69
 
70
70
        # If --no-aliases isn't working, we will not get retcode=3
71
 
        bzr('--no-aliases', 'c', 'a', retcode=3)
 
71
        bzr('--no-aliases c a', retcode=3)
72
72
 
73
73
        # If --no-aliases breaks all of bzr, we also get retcode=3
74
74
        # So we need to catch the output as well
75
 
        self.assertEquals(bzr_catch_error('--no-aliases', 'c', 'a',
 
75
        self.assertEquals(bzr_catch_error('--no-aliases c a',
76
76
                                          retcode=None),
77
77
                          'bzr: ERROR: unknown command "c"\n')
78
78
 
79
 
        bzr('c', '-r1', '-r2', retcode=3)
80
 
        bzr('c1', '-r1', '-r2', retcode=3)
 
79
        bzr('c -r1 -r2', retcode=3)
 
80
        bzr('c1 -r1 -r2', retcode=3)
81
81
        bzr('c2', retcode=3)
82
 
        bzr('c2', '-r1', retcode=3)
 
82
        bzr('c2 -r1', retcode=3)