/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/repository_implementations/test_reconcile.py

Merge knits branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/repository_implementations/test_reconcile.py
337
337
        d = bzrlib.bzrdir.BzrDir.open_from_transport(t)
338
338
        repo = d.open_repository()
339
339
        g = repo.get_revision_graph()
340
 
        if g['wrong-first-parent'] == ['1', '2']:
 
340
        if tuple(g['wrong-first-parent']) == ('1', '2'):
341
341
            raise TestSkipped('wrong-first-parent is not setup for testing')
342
342
        self.checkUnreconciled(d, repo.reconcile())
343
343
        # nothing should have been altered yet : inventories without
349
349
        self.assertEqual(0, reconciler.garbage_inventories)
350
350
        # and should have been fixed:
351
351
        g = repo.get_revision_graph()
352
 
        self.assertEqual(['1', '2'], g['wrong-first-parent'])
 
352
        self.assertEqual(('1', '2'), g['wrong-first-parent'])
353
353
 
354
354
    def test_reconcile_wrong_order_secondary(self):
355
355
        # a wrong order in secondary parents is ignored.