← 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: John Arbash Meinel
  • Date: 2007-03-14 20:47:17 UTC
  • mto: (2353.4.2 locking)
  • mto: This revision was merged to the branch mainline in revision 2360.
  • Revision ID: john@arbash-meinel.com-20070314204717-htynwogv97fqr22a
Cleanup errors, and change ReadOnlyLockError to pass around more details.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_cat.py
79
79
            tree.remove(['d-rev'])
80
80
            tree.rename_one('a-rev-tree', 'b-tree')
81
81
            tree.rename_one('c-rev', 'a-rev-tree')
 
82
 
 
83
            # 'b-tree' is not present in the old tree.
 
84
            self.run_bzr_error([], 'cat', 'b-tree', '--name-from-revision')
 
85
 
 
86
            # get to the old file automatically
 
87
            out, err = self.run_bzr('cat', 'd-rev')
 
88
            self.assertEqual('bar\n', out)
 
89
            self.assertEqual('', err)
 
90
 
 
91
            out, err = self.run_bzr('cat', 'a-rev-tree',
 
92
                                    '--name-from-revision')
 
93
            self.assertEqual('foo\n', out)
 
94
            self.assertEqual('', err)
 
95
 
 
96
            out, err = self.run_bzr('cat', 'a-rev-tree')
 
97
            self.assertEqual('baz\n', out)
 
98
            self.assertEqual('', err)
82
99
        finally:
83
 
            # calling bzr as another process require free lock on win32
84
100
            tree.unlock()
85
101
 
86
 
        # 'b-tree' is not present in the old tree.
87
 
        self.run_bzr_error(["^bzr: ERROR: u?'b-tree' "
88
 
                            "is not present in revision .+$"],
89
 
                           'cat b-tree --name-from-revision')
90
 
 
91
 
        # get to the old file automatically
92
 
        out, err = self.run_bzr('cat d-rev')
93
 
        self.assertEqual('bar\n', out)
94
 
        self.assertEqual('', err)
95
 
 
96
 
        out, err = self.run_bzr('cat a-rev-tree --name-from-revision')
97
 
        self.assertEqual('foo\n', out)
98
 
        self.assertEqual('', err)
99
 
 
100
 
        out, err = self.run_bzr('cat a-rev-tree')
101
 
        self.assertEqual('baz\n', out)
102
 
        self.assertEqual('', err)
103
 
 
104
102
    def test_remote_cat(self):
105
103
        wt = self.make_branch_and_tree('.')
106
104
        self.build_tree(['README'])
108
106
        wt.commit('Making sure there is a basis_tree available')
109
107
 
110
108
        url = self.get_readonly_url() + '/README'
111
 
        out, err = self.run_bzr(['cat', url])
 
109
        out, err = self.run_bzr('cat', url)
112
110
        self.assertEqual('contents of README\n', out)
113
111
 
114
112
    def test_cat_no_working_tree(self):
119
117
        wt.branch.bzrdir.destroy_workingtree()
120
118
 
121
119
        url = self.get_readonly_url() + '/README'
122
 
        out, err = self.run_bzr(['cat', url])
 
120
        out, err = self.run_bzr('cat', url)
123
121
        self.assertEqual('contents of README\n', out)
124
122