/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/per_tree/test_tree.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-07-03 03:20:44 UTC
  • mfrom: (7018.3.10 git-fixes)
  • Revision ID: breezy.the.bot@gmail.com-20180703032044-t5a5w5y0tmzrbezc
Port a few more bits of the git plugin to python 3.

Merged from https://code.launchpad.net/~jelmer/brz/git-fixes2/+merge/348803

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_tree/test_tree.py
33
33
    def test_annotate(self):
34
34
        work_tree = self.make_branch_and_tree('wt')
35
35
        tree = self.get_tree_no_parents_abc_content(work_tree)
36
 
        tree_revision = getattr(tree, 'get_revision_id', lambda: 'current:')()
 
36
        tree_revision = getattr(tree, 'get_revision_id', lambda: b'current:')()
37
37
        tree.lock_read()
38
38
        self.addCleanup(tree.unlock)
39
39
        for revision, line in tree.annotate_iter('a'):
40
 
            self.assertEqual('contents of a\n', line)
 
40
            self.assertEqual(b'contents of a\n', line)
41
41
            self.assertEqual(tree_revision, revision)
42
 
        tree_revision = getattr(tree, 'get_revision_id', lambda: 'random:')()
43
 
        for revision, line in tree.annotate_iter('a', default_revision='random:'):
44
 
            self.assertEqual('contents of a\n', line)
 
42
        tree_revision = getattr(tree, 'get_revision_id', lambda: b'random:')()
 
43
        for revision, line in tree.annotate_iter('a', default_revision=b'random:'):
 
44
            self.assertEqual(b'contents of a\n', line)
45
45
            self.assertEqual(tree_revision, revision)
46
46
 
47
47