← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Date: 2006-04-25 15:05:42 UTC
  • mfrom: (1185.85.85 bzr-encoding)
  • mto: This revision was merged to the branch mainline in revision 1752.
  • Revision ID: john@arbash-meinel.com-20060425150542-c7b518dca9928691
[merge] the old bzr-encoding changes, reparenting them on bzr.dev

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.EncodingAdapter import EncodingTestAdapter
26
27
from bzrlib.tests import (
27
28
                          _load_module_by_name,
28
29
                          TestCaseWithTransport,
29
30
                          TestSuite,
30
31
                          TestLoader,
 
32
                          iter_suite_tests,
31
33
                          )
32
34
import bzrlib.ui as ui
33
35
 
41
43
                     'bzrlib.tests.blackbox.test_bound_branches',
42
44
                     'bzrlib.tests.blackbox.test_cat',
43
45
                     'bzrlib.tests.blackbox.test_checkout',
 
46
                     'bzrlib.tests.blackbox.test_command_encoding',
44
47
                     'bzrlib.tests.blackbox.test_commit',
45
48
                     'bzrlib.tests.blackbox.test_conflicts',
46
49
                     'bzrlib.tests.blackbox.test_diff',
71
74
                     'bzrlib.tests.blackbox.test_upgrade',
72
75
                     'bzrlib.tests.blackbox.test_versioning',
73
76
                     ]
 
77
    test_encodings = [
 
78
        'bzrlib.tests.blackbox.test_non_ascii',
 
79
    ]
74
80
 
75
81
    suite = TestSuite()
76
82
    loader = TestLoader()
77
83
    for mod_name in testmod_names:
78
84
        mod = _load_module_by_name(mod_name)
79
85
        suite.addTest(loader.loadTestsFromModule(mod))
 
86
 
 
87
    adapter = EncodingTestAdapter()
 
88
    for mod_name in test_encodings:
 
89
        mod = _load_module_by_name(mod_name)
 
90
        for test in iter_suite_tests(loader.loadTestsFromModule(mod)):
 
91
            suite.addTests(adapter.adapt(test))
 
92
 
80
93
    return suite
81
94
 
82
95