← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

Merged John Meinel's integration

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/__init__.py
23
23
rather starts again from the run_bzr function.
24
24
"""
25
25
 
26
 
from bzrlib.tests import TestLoader
27
 
from bzrlib.tests import TestCaseInTempDir, BzrTestBase
 
26
from bzrlib.tests import (TestLoader, TestSuite, _load_module_by_name,
 
27
                          TestCaseInTempDir, BzrTestBase)
28
28
 
29
29
def test_suite():
30
30
    testmod_names = [
33
33
                     'bzrlib.tests.blackbox.test_cat',
34
34
                     'bzrlib.tests.blackbox.test_diff',
35
35
                     'bzrlib.tests.blackbox.test_export',
 
36
                     'bzrlib.tests.blackbox.test_find_merge_base',
 
37
                     'bzrlib.tests.blackbox.test_log',
36
38
                     'bzrlib.tests.blackbox.test_missing',
37
39
                     'bzrlib.tests.blackbox.test_outside_wt',
38
40
                     'bzrlib.tests.blackbox.test_pull',
45
47
                     'bzrlib.tests.blackbox.test_upgrade',
46
48
                     'bzrlib.tests.blackbox.test_versioning',
47
49
                     ]
48
 
    return TestLoader().loadTestsFromNames(testmod_names)
 
50
 
 
51
    suite = TestSuite()
 
52
    loader = TestLoader()
 
53
    for mod_name in testmod_names:
 
54
        mod = _load_module_by_name(mod_name)
 
55
        suite.addTest(loader.loadTestsFromModule(mod))
 
56
    return suite
49
57
 
50
58
 
51
59
class ExternalBase(TestCaseInTempDir):