← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

Merge up bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/interversionedfile_implementations/__init__.py
27
27
from bzrlib.tests import (
28
28
                          adapt_modules,
29
29
                          default_transport,
30
 
                          TestLoader,
31
30
                          TestScenarioApplier,
32
 
                          TestSuite,
33
31
                          )
34
32
 
35
33
 
89
87
        return result
90
88
 
91
89
 
92
 
def test_suite():
93
 
    result = TestSuite()
 
90
def load_tests(basic_tests, module, loader):
 
91
    result = loader.suiteClass()
 
92
    # add the tests for this module
 
93
    result.addTests(basic_tests)
 
94
 
94
95
    test_interversionedfile_implementations = [
95
96
        'bzrlib.tests.interversionedfile_implementations.test_join',
96
97
        ]
101
102
        None,
102
103
        InterVersionedFileTestProviderAdapter.default_test_list()
103
104
        )
104
 
    loader = TestLoader()
105
 
    adapt_modules(test_interversionedfile_implementations, adapter, loader, result)
 
105
    # add the tests for the sub modules
 
106
    adapt_modules(test_interversionedfile_implementations,
 
107
                  adapter, loader, result)
106
108
    return result