/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_revision.py

  • Committer: Jelmer Vernooij
  • Date: 2018-04-02 00:52:27 UTC
  • mfrom: (6939 work)
  • mto: This revision was merged to the branch mainline in revision 7274.
  • Revision ID: jelmer@jelmer.uk-20180402005227-pecflp1mvdjrjqd6
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_cat_revision.py
22
22
 
23
23
    def test_cat_unicode_revision(self):
24
24
        tree = self.make_branch_and_tree('.')
25
 
        tree.commit('This revision', rev_id='abcd')
 
25
        tree.commit('This revision', rev_id=b'abcd')
26
26
        output, errors = self.run_bzr(['cat-revision', u'abcd'])
27
27
        self.assertContainsRe(output, 'This revision')
28
28
        self.assertEqual('', errors)
33
33
        wt = self.make_branch_and_tree('.')
34
34
        r = wt.branch.repository
35
35
 
36
 
        wt.commit('Commit one', rev_id='a@r-0-1')
37
 
        wt.commit('Commit two', rev_id='a@r-0-2')
38
 
        wt.commit('Commit three', rev_id='a@r-0-3')
 
36
        wt.commit('Commit one', rev_id=b'a@r-0-1')
 
37
        wt.commit('Commit two', rev_id=b'a@r-0-2')
 
38
        wt.commit('Commit three', rev_id=b'a@r-0-3')
39
39
 
40
 
        r.lock_read()
41
 
        try:
 
40
        with r.lock_read():
42
41
            revs = {}
43
42
            for i in (1, 2, 3):
44
43
                revid = "a@r-0-%d" % i
45
44
                stream = r.revisions.get_record_stream([(revid,)], 'unordered', 
46
45
                                                       False) 
47
46
                revs[i] = stream.next().get_bytes_as('fulltext')
48
 
        finally:
49
 
            r.unlock()
50
47
 
51
48
        for i in [1, 2, 3]:
52
49
            self.assertEqual(revs[i],
64
61
    def test_cat_revision_directory(self):
65
62
        """Test --directory option"""
66
63
        tree = self.make_branch_and_tree('a')
67
 
        tree.commit('This revision', rev_id='abcd')
 
64
        tree.commit('This revision', rev_id=b'abcd')
68
65
        output, errors = self.run_bzr(['cat-revision', '-d', 'a', u'abcd'])
69
66
        self.assertContainsRe(output, 'This revision')
70
67
        self.assertEqual('', errors)
71
68
 
72
69
    def test_cat_tree_less_branch(self):
73
70
        tree = self.make_branch_and_tree('.')
74
 
        tree.commit('This revision', rev_id='abcd')
 
71
        tree.commit('This revision', rev_id=b'abcd')
75
72
        tree.controldir.destroy_workingtree()
76
73
        output, errors = self.run_bzr(['cat-revision', '-d', 'a', u'abcd'])
77
74
        self.assertContainsRe(output, 'This revision')