/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_workingtree/test_pull.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-06-30 12:37:04 UTC
  • mfrom: (6973.10.9 python3-i)
  • Revision ID: breezy.the.bot@gmail.com-20180630123704-jq2qazweqd3u5ssp
Add more bees.

Merged from https://code.launchpad.net/~jelmer/brz/python3-i/+merge/348244

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_workingtree/test_pull.py
66
66
        tree.add(['file'])
67
67
        tree.commit('first')
68
68
        to_tree = tree.controldir.sprout('to').open_workingtree()
69
 
        self.assertEqual('first_root_id', to_tree.get_root_id())
 
69
        self.assertEqual(b'first_root_id', to_tree.get_root_id())
70
70
        tree.set_root_id(b'second_root_id')
71
71
        tree.commit('second')
72
72
        to_tree.pull(tree.branch)
73
 
        self.assertEqual('second_root_id', to_tree.get_root_id())
 
73
        self.assertEqual(b'second_root_id', to_tree.get_root_id())
74
74
 
75
75
 
76
76
class TestPullWithOrphans(per_workingtree.TestCaseWithWorkingTree):
83
83
 
84
84
        # Create an empty trunk
85
85
        builder.build_snapshot(None, [
86
 
                ('add', ('', 'root-id', 'directory', ''))],
 
86
                ('add', ('', b'root-id', 'directory', ''))],
87
87
                revision_id=b'1')
88
 
        builder.build_snapshot(['1'], [
89
 
                ('add', ('dir', 'dir-id', 'directory', '')),
90
 
                ('add', ('file', 'file-id', 'file', 'trunk content\n')),],
 
88
        builder.build_snapshot([b'1'], [
 
89
                ('add', ('dir', b'dir-id', 'directory', '')),
 
90
                ('add', ('file', b'file-id', 'file', b'trunk content\n')),],
91
91
                revision_id=b'2')
92
 
        builder.build_snapshot(['2'], [
 
92
        builder.build_snapshot([b'2'], [
93
93
                ('unversion', 'dir'),],
94
94
                revision_id=b'3')
95
95
        builder.finish_series()