← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

Merge up bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_lock/__init__.py
63
63
        return result
64
64
 
65
65
 
66
 
def test_suite():
67
 
    result = tests.TestSuite()
 
66
def load_tests(basic_tests, module, loader):
 
67
    result = loader.suiteClass()
 
68
    # add the tests for this module
 
69
    result.addTests(basic_tests)
 
70
 
68
71
    test_lock_implementations = [
69
72
        'bzrlib.tests.per_lock.test_lock',
70
73
        'bzrlib.tests.per_lock.test_temporary_write_lock',
71
74
        ]
72
75
    adapter = LockTestProviderAdapter(lock._lock_classes)
73
 
    loader = tests.TestLoader()
 
76
    # add the tests for the sub modules
74
77
    tests.adapt_modules(test_lock_implementations, adapter, loader, result)
75
78
    return result