~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_repository/test_reconcile.py

  • Committer: Vincent Ladeuil
  • Date: 2011-01-27 14:27:18 UTC
  • mto: (5609.10.1 2.3b5-dev)
  • mto: This revision was merged to the branch mainline in revision 5635.
  • Revision ID: v.ladeuil+lp@free.fr-20110127142718-1ik7fyjfflgj91j5
Use self.get_transport instead of transport.get_transport where possible.

Show diffs side-by-side

added added

removed removed

Lines of Context:
61
61
    def setUp(self):
62
62
        super(TestsNeedingReweave, self).setUp()
63
63
 
64
 
        t = transport.get_transport(self.get_url())
 
64
        t = self.get_transport()
65
65
        # an empty inventory with no revision for testing with.
66
66
        repo = self.make_repository('inventory_without_revision')
67
67
        repo.lock_write()
312
312
        self.reduceLockdirTimeout()
313
313
        super(TestReconcileWithIncorrectRevisionCache, self).setUp()
314
314
 
315
 
        t = transport.get_transport(self.get_url())
 
315
        t = self.get_transport()
316
316
        # we need a revision with two parents in the wrong order
317
317
        # which should trigger reinsertion.
318
318
        # and another with the first one correct but the other two not
381
381
 
382
382
    def test_reconcile_wrong_order(self):
383
383
        # a wrong order in primary parents is optionally correctable
384
 
        t = transport.get_transport(self.get_url()).clone('wrong-first-parent')
 
384
        t = self.get_transport().clone('wrong-first-parent')
385
385
        d = bzrlib.bzrdir.BzrDir.open_from_transport(t)
386
386
        repo = d.open_repository()
387
387
        repo.lock_read()
410
410
 
411
411
    def test_reconcile_wrong_order_secondary_inventory(self):
412
412
        # a wrong order in the parents for inventories is ignored.
413
 
        t = transport.get_transport(self.get_url()
414
 
                                    ).clone('reversed-secondary-parents')
 
413
        t = self.get_transport().clone('reversed-secondary-parents')
415
414
        d = bzrlib.bzrdir.BzrDir.open_from_transport(t)
416
415
        repo = d.open_repository()
417
416
        self.checkUnreconciled(d, repo.reconcile())