/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 breezy/tests/blackbox/test_cat.py

  • Committer: Jelmer Vernooij
  • Date: 2018-03-24 17:48:04 UTC
  • mfrom: (6921 work)
  • mto: This revision was merged to the branch mainline in revision 6923.
  • Revision ID: jelmer@jelmer.uk-20180324174804-xf22o05byoj12x1q
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_cat.py
27
27
 
28
28
    def test_cat(self):
29
29
        tree = self.make_branch_and_tree('branch')
30
 
        self.build_tree_contents([('branch/a', b'foo\n')])
 
30
        self.build_tree_contents([('branch/a', 'foo\n')])
31
31
        tree.add('a')
32
32
        # 'brz cat' without an option should cat the last revision
33
33
        self.run_bzr(['cat', 'a'], retcode=3, working_dir='branch')
34
34
 
35
35
        tree.commit(message='1')
36
 
        self.build_tree_contents([('branch/a', b'baz\n')])
 
36
        self.build_tree_contents([('branch/a', 'baz\n')])
37
37
 
38
38
        self.assertEqual('foo\n',
39
39
                          self.run_bzr(['cat', 'a'], working_dir='branch')[0])
77
77
        # current trees later in the test case
78
78
        # a-rev-tree is special because it appears in both the revision
79
79
        # tree and the working tree
80
 
        self.build_tree_contents([('a-rev-tree', b'foo\n'),
81
 
            ('c-rev', b'baz\n'), ('d-rev', b'bar\n'), ('e-rev', b'qux\n')])
 
80
        self.build_tree_contents([('a-rev-tree', 'foo\n'),
 
81
            ('c-rev', 'baz\n'), ('d-rev', 'bar\n'), ('e-rev', 'qux\n')])
82
82
        with tree.lock_write():
83
83
            tree.add(['a-rev-tree', 'c-rev', 'd-rev', 'e-rev'])
84
 
            tree.commit('add test files', rev_id=b'first')
 
84
            tree.commit('add test files', rev_id='first')
85
85
            # remove currently uses self._write_inventory -
86
86
            # work around that for now.
87
87
            tree.flush()
89
89
            tree.rename_one('a-rev-tree', 'b-tree')
90
90
            tree.rename_one('c-rev', 'a-rev-tree')
91
91
            tree.rename_one('e-rev', 'old-rev')
92
 
            self.build_tree_contents([('e-rev', b'new\n')])
 
92
            self.build_tree_contents([('e-rev', 'new\n')])
93
93
            tree.add(['e-rev'])
94
94
 
95
95
        # 'b-tree' is not present in the old tree.
161
161
        from ...tree import Tree
162
162
        wt = self.make_branch_and_tree('.')
163
163
        self.build_tree_contents([
164
 
            ('README', b"junk\nline 1 of README\nline 2 of README\n"),
 
164
            ('README', "junk\nline 1 of README\nline 2 of README\n"),
165
165
            ])
166
166
        wt.add('README')
167
167
        wt.commit('Making sure there is a basis_tree available')
219
219
    def test_simple_branch_cat(self):
220
220
        self.setup_smart_server_with_call_log()
221
221
        t = self.make_branch_and_tree('branch')
222
 
        self.build_tree_contents([('branch/foo', b'thecontents')])
 
222
        self.build_tree_contents([('branch/foo', 'thecontents')])
223
223
        t.add("foo")
224
224
        t.commit("message")
225
225
        self.reset_smart_call_log()