← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

Merge bzr.dev 5755, so that we get 2.3 via bzr.dev instead of via direct to 2.3

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_repository/test_reconcile.py
49
49
    def checkNoBackupInventory(self, aBzrDir):
50
50
        """Check that there is no backup inventory in aBzrDir."""
51
51
        repo = aBzrDir.open_repository()
52
 
        # Remote repository, and possibly others, do not have
53
 
        # _transport.
54
 
        if getattr(repo, '_transport', None) is not None:
55
 
            for path in repo._transport.list_dir('.'):
56
 
                self.assertFalse('inventory.backup' in path)
 
52
        for path in repo.control_transport.list_dir('.'):
 
53
            self.assertFalse('inventory.backup' in path)
57
54
 
58
55
 
59
56
class TestsNeedingReweave(TestReconcile):
197
194
    def check_missing_was_removed(self, repo):
198
195
        if repo._reconcile_backsup_inventory:
199
196
            backed_up = False
200
 
            for path in repo._transport.list_dir('.'):
 
197
            for path in repo.control_transport.list_dir('.'):
201
198
                if 'inventory.backup' in path:
202
199
                    backed_up = True
203
200
            self.assertTrue(backed_up)