← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

Merge extra branch work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/__init__.py
28
28
    errors,
29
29
    tests,
30
30
    )
31
 
from bzrlib.branch import BranchFormat
 
31
from bzrlib.branch import (BranchFormat,
 
32
                           )
32
33
from bzrlib.remote import RemoteBranchFormat, RemoteBzrDirFormat
33
34
from bzrlib.tests import test_server
34
35
from bzrlib.tests.per_controldir.test_controldir import TestCaseWithControlDir
157
158
    return scenarios
158
159
 
159
160
 
160
 
def per_branch_tests(loader):
 
161
def load_tests(standard_tests, module, loader):
161
162
    per_branch_mod_names = [
162
163
        'bound_sftp',
163
164
        'branch',
188
189
        'uncommit',
189
190
        'update',
190
191
        ]
191
 
    return loader.loadTestsFromModuleNames(
 
192
    sub_tests = loader.loadTestsFromModuleNames(
192
193
        ['bzrlib.tests.per_branch.test_' + name
193
194
         for name in per_branch_mod_names])
194
 
 
195
 
 
196
 
def load_tests(standard_tests, module, loader):
197
 
    return tests.multiply_tests(per_branch_tests(loader), branch_scenarios(),
198
 
        standard_tests)
 
195
    return tests.multiply_tests(sub_tests, branch_scenarios(), standard_tests)