/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-02-18 15:21:06 UTC
  • mto: This revision was merged to the branch mainline in revision 6928.
  • Revision ID: jelmer@jelmer.uk-20180218152106-m8bmfurzlspweyu4
Yet more bees.

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
40
        with r.lock_read():
41
41
            revs = {}
61
61
    def test_cat_revision_directory(self):
62
62
        """Test --directory option"""
63
63
        tree = self.make_branch_and_tree('a')
64
 
        tree.commit('This revision', rev_id='abcd')
 
64
        tree.commit('This revision', rev_id=b'abcd')
65
65
        output, errors = self.run_bzr(['cat-revision', '-d', 'a', u'abcd'])
66
66
        self.assertContainsRe(output, 'This revision')
67
67
        self.assertEqual('', errors)
68
68
 
69
69
    def test_cat_tree_less_branch(self):
70
70
        tree = self.make_branch_and_tree('.')
71
 
        tree.commit('This revision', rev_id='abcd')
 
71
        tree.commit('This revision', rev_id=b'abcd')
72
72
        tree.controldir.destroy_workingtree()
73
73
        output, errors = self.run_bzr(['cat-revision', '-d', 'a', u'abcd'])
74
74
        self.assertContainsRe(output, 'This revision')