← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

Merge extra wt formats.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_tree/__init__.py
371
371
    return scenario_options
372
372
 
373
373
 
374
 
def per_tree_tests(loader):
 
374
def load_tests(standard_tests, module, loader):
375
375
    per_tree_mod_names = [
376
376
        'annotate_iter',
377
377
        'get_file_mtime',
389
389
        'tree',
390
390
        'walkdirs',
391
391
        ]
392
 
    return loader.loadTestsFromModuleNames(
 
392
    submod_tests = loader.loadTestsFromModuleNames(
393
393
        ['bzrlib.tests.per_tree.test_' + name
394
394
         for name in per_tree_mod_names])
395
 
 
396
 
 
397
 
def load_tests(standard_tests, module, loader):
398
395
    scenarios = make_scenarios(
399
396
        tests.default_transport,
400
397
        # None here will cause a readonly decorator to be created
401
398
        # by the TestCaseWithTransport.get_readonly_transport method.
402
399
        None,
403
 
        WorkingTreeFormat._formats.values())
 
400
        WorkingTreeFormat.get_formats())
404
401
    # add the tests for the sub modules
405
 
    return tests.multiply_tests(per_tree_tests(loader), scenarios, standard_tests)
 
402
    return tests.multiply_tests(submod_tests, scenarios, standard_tests)