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

  • Committer: Vincent Ladeuil
  • Date: 2008-09-12 08:44:07 UTC
  • mto: (3705.1.1 trunk2)
  • mto: This revision was merged to the branch mainline in revision 3708.
  • Revision ID: v.ladeuil+lp@free.fr-20080912084407-wepmepg1fvbpqzly
Fixed as per jam's review.

* tests/test_missing.py:
(TestMissing.assertUnmerged): Add the 'backward' parameter.
(TestMissing.test_find_unmerged): Test 'backward' for mainline
revisions.
(TestFindUnmerged): Add the 'backward' parameter.
(TestFindUnmerged.test_include_merges): Test 'backward' for merged
revisions.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_missing.py
30
30
 
31
31
class TestMissing(TestCaseWithTransport):
32
32
 
33
 
    def assertUnmerged(self, expected, source, target, restrict='all'):
34
 
        unmerged = missing.find_unmerged(source, target, restrict=restrict)
 
33
    def assertUnmerged(self, expected, source, target, restrict='all',
 
34
                       backward=False):
 
35
        unmerged = missing.find_unmerged(source, target, restrict=restrict,
 
36
                                         backward=backward)
35
37
        self.assertEqual(expected, unmerged)
36
38
 
37
39
    def test_find_unmerged(self):
51
53
        original_tree.commit('c', rev_id='c')
52
54
        self.assertUnmerged(([('2', 'b'), ('3', 'c')], []),
53
55
                            original, puller)
 
56
        self.assertUnmerged(([('3', 'c'), ('2', 'b')], []),
 
57
                            original, puller, backward=True)
54
58
 
55
59
        puller_tree.pull(original)
56
60
        self.assertUnmerged(([], []), original, puller)
134
138
class TestFindUnmerged(tests.TestCaseWithTransport):
135
139
 
136
140
    def assertUnmerged(self, local, remote, local_branch, remote_branch,
137
 
                       restrict, include_merges=False):
 
141
                       restrict, include_merges=False,
 
142
                       backward=False):
138
143
        """Check the output of find_unmerged_mainline_revisions"""
139
144
        local_extra, remote_extra = missing.find_unmerged(
140
145
                                        local_branch, remote_branch, restrict,
141
 
                                        include_merges=include_merges)
 
146
                                        include_merges=include_merges,
 
147
                                        backward=backward)
142
148
        self.assertEqual(local, local_extra)
143
149
        self.assertEqual(remote, remote_extra)
144
150
 
200
206
                            tree.branch, tree2.branch, 'all',
201
207
                            include_merges=True)
202
208
 
203
 
    # TODO: test_dont_include_already_merged_merges ?
 
209
        self.assertUnmerged([], [('4', 'rev6', 0),
 
210
                                 ('3.1.2', 'rev5', 1), ('3.1.1', 'rev4', 1),
 
211
                                 ('3', 'rev3',0 ), ('2', 'rev2', 0),
 
212
                                 ],
 
213
                            tree.branch, tree2.branch, 'all',
 
214
                            include_merges=True,
 
215
                            backward=True)