← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

Merge up bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/branch_implementations/__init__.py
135
135
        return tree
136
136
 
137
137
 
138
 
def test_suite():
139
 
    result = tests.TestSuite()
 
138
def load_tests(basic_tests, module, loader):
 
139
    result = loader.suiteClass()
 
140
    # add the tests for this module
 
141
    result.addTests(basic_tests)
 
142
 
140
143
    test_branch_implementations = [
141
144
        'bzrlib.tests.branch_implementations.test_bound_sftp',
142
145
        'bzrlib.tests.branch_implementations.test_branch',
143
146
        'bzrlib.tests.branch_implementations.test_break_lock',
 
147
        'bzrlib.tests.branch_implementations.test_check',
144
148
        'bzrlib.tests.branch_implementations.test_create_checkout',
145
149
        'bzrlib.tests.branch_implementations.test_commit',
146
150
        'bzrlib.tests.branch_implementations.test_get_revision_id_to_revno_map',
152
156
        'bzrlib.tests.branch_implementations.test_permissions',
153
157
        'bzrlib.tests.branch_implementations.test_pull',
154
158
        'bzrlib.tests.branch_implementations.test_push',
 
159
        'bzrlib.tests.branch_implementations.test_reconcile',
155
160
        'bzrlib.tests.branch_implementations.test_revision_history',
156
161
        'bzrlib.tests.branch_implementations.test_revision_id_to_revno',
157
162
        'bzrlib.tests.branch_implementations.test_sprout',
170
175
        # by the TestCaseWithTransport.get_readonly_transport method.
171
176
        None,
172
177
        combinations)
173
 
    loader = tests.TestLoader()
 
178
    # add the tests for the sub modules
174
179
    tests.adapt_modules(test_branch_implementations, adapter, loader, result)
175
180
 
176
181
    adapt_to_smart_server = BranchTestProviderAdapter(