~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

Merge integration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
24
24
rather than in tests/branch_implementations/*.py.
25
25
"""
26
26
 
27
 
from bzrlib.branch import BranchTestProviderAdapter, BzrBranchFormat
 
27
from bzrlib.branch import (BranchFormat,
 
28
                           BranchTestProviderAdapter,
 
29
                           _legacy_formats,
 
30
                           )
28
31
from bzrlib.tests import (
29
32
                          adapt_modules,
30
33
                          default_transport,
37
40
    result = TestSuite()
38
41
    test_branch_implementations = [
39
42
        'bzrlib.tests.branch_implementations.test_branch',
 
43
        'bzrlib.tests.branch_implementations.test_parent',
 
44
        'bzrlib.tests.branch_implementations.test_permissions',
40
45
        ]
41
46
    adapter = BranchTestProviderAdapter(
42
47
        default_transport,
43
48
        # None here will cause a readonly decorator to be created
44
49
        # by the TestCaseWithTransport.get_readonly_transport method.
45
50
        None,
46
 
        BzrBranchFormat._formats.values())
 
51
        [(format, format._matchingbzrdir) for format in 
 
52
         BranchFormat._formats.values() + _legacy_formats])
47
53
    loader = TestLoader()
48
54
    adapt_modules(test_branch_implementations, adapter, loader, result)
49
55
    return result