/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

  • Committer: Robert Collins
  • Date: 2007-07-19 06:34:09 UTC
  • mto: (2592.3.46 repository)
  • mto: This revision was merged to the branch mainline in revision 2651.
  • Revision ID: robertc@robertcollins.net-20070719063409-stu9sckrxp8wp3mo
LIBRARY API BREAKS:

  * KnitIndex.get_parents now returns tuples. (Robert Collins)

INTERNALS:

  * Unused functions on the private interface KnitIndex have been removed.
    (Robert Collins)

  * New ``knit.KnitGraphIndex`` which provides a ``KnitIndex`` layered on top
    of a ``index.GraphIndex``. (Robert Collins)

  * New ``knit.KnitVersionedFile.iter_parents`` method that allows querying
    the parents of many knit nodes at once, reducing round trips to the 
    underlying index. (Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/repository_implementations/test_reconcile.py
313
313
        d = bzrlib.bzrdir.BzrDir.open_from_transport(t)
314
314
        repo = d.open_repository()
315
315
        g = repo.get_revision_graph()
316
 
        if g['wrong-first-parent'] == ['1', '2']:
 
316
        if tuple(g['wrong-first-parent']) == ('1', '2'):
317
317
            raise TestSkipped('wrong-first-parent is not setup for testing')
318
318
        self.checkUnreconciled(d, repo.reconcile())
319
319
        # nothing should have been altered yet : inventories without
325
325
        self.assertEqual(0, reconciler.garbage_inventories)
326
326
        # and should have been fixed:
327
327
        g = repo.get_revision_graph()
328
 
        self.assertEqual(['1', '2'], g['wrong-first-parent'])
 
328
        self.assertEqual(('1', '2'), g['wrong-first-parent'])
329
329
 
330
330
    def test_reconcile_wrong_order_secondary(self):
331
331
        # a wrong order in secondary parents is ignored.