← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_cat.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_cat.py
86
86
        # 'b-tree' is not present in the old tree.
87
87
        self.run_bzr_error(["^bzr: ERROR: u?'b-tree' "
88
88
                            "is not present in revision .+$"],
89
 
                           'cat', 'b-tree', '--name-from-revision')
 
89
                           'cat b-tree --name-from-revision')
90
90
 
91
91
        # get to the old file automatically
92
 
        out, err = self.run_bzr('cat', 'd-rev')
 
92
        out, err = self.run_bzr('cat d-rev')
93
93
        self.assertEqual('bar\n', out)
94
94
        self.assertEqual('', err)
95
95
 
96
 
        out, err = self.run_bzr('cat', 'a-rev-tree',
97
 
                                '--name-from-revision')
 
96
        out, err = self.run_bzr('cat a-rev-tree --name-from-revision')
98
97
        self.assertEqual('foo\n', out)
99
98
        self.assertEqual('', err)
100
99
 
101
 
        out, err = self.run_bzr('cat', 'a-rev-tree')
 
100
        out, err = self.run_bzr('cat a-rev-tree')
102
101
        self.assertEqual('baz\n', out)
103
102
        self.assertEqual('', err)
104
103
 
109
108
        wt.commit('Making sure there is a basis_tree available')
110
109
 
111
110
        url = self.get_readonly_url() + '/README'
112
 
        out, err = self.run_bzr('cat', url)
 
111
        out, err = self.run_bzr(['cat', url])
113
112
        self.assertEqual('contents of README\n', out)
114
113
 
115
114
    def test_cat_no_working_tree(self):
120
119
        wt.branch.bzrdir.destroy_workingtree()
121
120
 
122
121
        url = self.get_readonly_url() + '/README'
123
 
        out, err = self.run_bzr('cat', url)
 
122
        out, err = self.run_bzr(['cat', url])
124
123
        self.assertEqual('contents of README\n', out)
125
124