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

Improve common_ancestor performance.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revision.py
242
242
                          revisions_2[4])
243
243
        self.assertEqual(common_ancestor(revisions[4], revisions_2[5], sources),
244
244
                          revisions_2[4])
245
 
        self.assertEqual(common_ancestor(revisions[5], revisions_2[6], sources),
246
 
                          revisions[4]) # revisions_2[5] is equally valid
247
 
        self.assertEqual(common_ancestor(revisions_2[6], revisions[5], sources),
248
 
                          revisions[4]) # revisions_2[5] is equally valid
 
245
        self.assertTrue(common_ancestor(revisions[5], revisions_2[6], sources) in
 
246
                        (revisions[4], revisions_2[5]))
 
247
        self.assertTrue(common_ancestor(revisions_2[6], revisions[5], sources),
 
248
                        (revisions[4], revisions_2[5]))
249
249
        self.assertEqual(None, common_ancestor(None, revisions[5], sources))
250
250
 
251
251
    def test_combined(self):