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

  • Committer: Jelmer Vernooij
  • Date: 2018-07-08 15:47:10 UTC
  • mto: This revision was merged to the branch mainline in revision 7036.
  • Revision ID: jelmer@jelmer.uk-20180708154710-zebexq602tcer8hv
Fix more merge tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_missing.py
41
41
        merger = merger_tree.branch
42
42
        self.assertUnmerged(([], []), original, puller)
43
43
        original_tree.commit('a', rev_id=b'a')
44
 
        self.assertUnmerged(([('1', 'a', 0)], []), original, puller)
 
44
        self.assertUnmerged(([('1', b'a', 0)], []), original, puller)
45
45
        puller_tree.pull(original)
46
46
        self.assertUnmerged(([], []), original, puller)
47
47
        merger_tree.pull(original)
48
48
        original_tree.commit('b', rev_id=b'b')
49
49
        original_tree.commit('c', rev_id=b'c')
50
 
        self.assertUnmerged(([('2', 'b', 0), ('3', 'c', 0)], []),
 
50
        self.assertUnmerged(([('2', b'b', 0), ('3', b'c', 0)], []),
51
51
                            original, puller)
52
 
        self.assertUnmerged(([('3', 'c', 0), ('2', 'b', 0)], []),
 
52
        self.assertUnmerged(([('3', b'c', 0), ('2', b'b', 0)], []),
53
53
                            original, puller, backward=True)
54
54
 
55
55
        puller_tree.pull(original)
56
56
        self.assertUnmerged(([], []), original, puller)
57
 
        self.assertUnmerged(([('2', 'b', 0), ('3', 'c', 0)], []),
 
57
        self.assertUnmerged(([('2', b'b', 0), ('3', b'c', 0)], []),
58
58
                            original, merger)
59
59
        merger_tree.merge_from_branch(original)
60
 
        self.assertUnmerged(([('2', 'b', 0), ('3', 'c', 0)], []),
 
60
        self.assertUnmerged(([('2', b'b', 0), ('3', b'c', 0)], []),
61
61
                            original, merger)
62
62
        merger_tree.commit('d', rev_id=b'd')
63
 
        self.assertUnmerged(([], [('2', 'd', 0)]), original, merger)
 
63
        self.assertUnmerged(([], [('2', b'd', 0)]), original, merger)
64
64
 
65
65
    def test_iter_log_revisions(self):
66
66
        base_tree = self.make_branch_and_tree('base')
97
97
 
98
98
        r0, r1, r2, r3 = results
99
99
 
100
 
        self.assertEqual([('2', 'c-2'), ('3', 'c-3'),
101
 
                          ('4', 'c-4'), ('5', 'c-5'),],
 
100
        self.assertEqual([('2', b'c-2'), ('3', b'c-3'),
 
101
                          ('4', b'c-4'), ('5', b'c-5'),],
102
102
                         [(r.revno, r.rev.revision_id) for r in results])
103
103
 
104
104
        delta0 = r0.delta
202
202
        tree2.merge_from_branch(tree3.branch)
203
203
        rev6 = tree2.commit('six', rev_id=b'rev6')
204
204
 
205
 
        self.assertUnmerged([], [('2', 'rev2', 0), ('3', 'rev3', 0),
206
 
                                 ('4', 'rev6', 0),
207
 
                                 ('3.1.1', 'rev4', 1), ('3.1.2', 'rev5', 1),
 
205
        self.assertUnmerged([], [('2', b'rev2', 0), ('3', b'rev3', 0),
 
206
                                 ('4', b'rev6', 0),
 
207
                                 ('3.1.1', b'rev4', 1), ('3.1.2', b'rev5', 1),
208
208
                                 ],
209
209
                            tree.branch, tree2.branch,
210
210
                            include_merged=True)
211
211
 
212
 
        self.assertUnmerged([], [('4', 'rev6', 0),
213
 
                                 ('3.1.2', 'rev5', 1), ('3.1.1', 'rev4', 1),
214
 
                                 ('3', 'rev3', 0), ('2', 'rev2', 0),
 
212
        self.assertUnmerged([], [('4', b'rev6', 0),
 
213
                                 ('3.1.2', b'rev5', 1), ('3.1.1', b'rev4', 1),
 
214
                                 ('3', b'rev3', 0), ('2', b'rev2', 0),
215
215
                                 ],
216
216
                            tree.branch, tree2.branch,
217
217
                            include_merged=True,
218
218
                            backward=True)
219
219
 
220
 
        self.assertUnmerged([], [('4', 'rev6', 0)],
 
220
        self.assertUnmerged([], [('4', b'rev6', 0)],
221
221
            tree.branch, tree2.branch,
222
222
            include_merged=True, remote_revid_range=(rev6, rev6))
223
223
 
224
 
        self.assertUnmerged([], [('3', 'rev3', 0), ('3.1.1', 'rev4', 1)],
 
224
        self.assertUnmerged([], [('3', b'rev3', 0), ('3.1.1', b'rev4', 1)],
225
225
                    tree.branch, tree2.branch,
226
226
                    include_merged=True, remote_revid_range=(rev3, rev4))
227
227
 
228
 
        self.assertUnmerged([], [('4', 'rev6', 0), ('3.1.2', 'rev5', 1)],
 
228
        self.assertUnmerged([], [('4', b'rev6', 0), ('3.1.2', b'rev5', 1)],
229
229
                    tree.branch, tree2.branch,
230
230
                    include_merged=True, remote_revid_range=(rev5, rev6))
231
231