← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/intertree_implementations/__init__.py
27
27
from bzrlib.tests import (
28
28
                          adapt_modules,
29
29
                          default_transport,
30
 
                          TestLoader,
31
 
                          TestSuite,
32
30
                          )
33
31
from bzrlib.tests.tree_implementations import (
34
32
    return_parameter,
95
93
        return result
96
94
 
97
95
 
98
 
def test_suite():
99
 
    result = TestSuite()
100
 
    loader = TestLoader()
 
96
def load_tests(basic_tests, module, loader):
 
97
    result = loader.suiteClass()
101
98
    # load the tests of the infrastructure for these tests
102
 
    result.addTests(loader.loadTestsFromModuleNames(['bzrlib.tests.intertree_implementations']))
 
99
    result.addTests(basic_tests)
103
100
 
104
101
    default_tree_format = WorkingTreeFormat3()
105
102
    test_intertree_implementations = [
121
118
        # by the TestCaseWithTransport.get_readonly_transport method.
122
119
        None,
123
120
        test_intertree_permutations)
 
121
    # add the tests for the sub modules
124
122
    adapt_modules(test_intertree_implementations, adapter, loader, result)
125
123
    return result