← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/branch_implementations/test_locking.py

Merge hpss-protocol2.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/branch_implementations/test_locking.py
18
18
 
19
19
from bzrlib import errors
20
20
from bzrlib.branch import BzrBranchFormat4
 
21
from bzrlib.bzrdir import RemoteBzrDirFormat
21
22
from bzrlib.tests import TestSkipped
22
23
from bzrlib.tests.branch_implementations.test_branch import TestCaseWithBranch
23
24
from bzrlib.tests.lock_helpers import TestPreventLocking, LockWrapper
39
40
        b = LockWrapper(self.locks, self.get_branch(), 'b')
40
41
        b.repository = LockWrapper(self.locks, b.repository, 'r')
41
42
        bcf = b.control_files
42
 
        rcf = b.repository.control_files
 
43
        rcf = getattr(b.repository, 'control_files', None)
 
44
        if rcf is None:
 
45
            raise TestSkipped(
 
46
                "This tests depends on being able to instrument "
 
47
                "repository.control_files, but %r doesn't have control_files."
 
48
                % (b.repository,))
43
49
 
44
50
        # Look out for branch types that reuse their control files
45
51
        self.combined_control = bcf is rcf