/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/__init__.py
27
27
from bzrlib.tests import (
28
28
                          adapt_modules,
29
29
                          TestCaseWithTransport,
30
 
                          TestSuite,
31
 
                          TestLoader,
32
30
                          iter_suite_tests,
33
31
                          )
34
32
from bzrlib.tests.EncodingAdapter import EncodingTestAdapter
35
33
from bzrlib.symbol_versioning import (
36
34
    deprecated_method,
37
 
    zero_eighteen,
38
35
    )
39
36
import bzrlib.ui as ui
40
37
 
41
38
 
42
 
def test_suite():
 
39
def load_tests(basic_tests, module, loader):
 
40
    suite = loader.suiteClass()
 
41
    # add the tests for this module
 
42
    suite.addTests(basic_tests)
 
43
 
43
44
    testmod_names = [
44
45
                     'bzrlib.tests.blackbox.test_add',
45
46
                     'bzrlib.tests.blackbox.test_added',
115
116
                     'bzrlib.tests.blackbox.test_versioning',
116
117
                     'bzrlib.tests.blackbox.test_whoami',
117
118
                     ]
 
119
    # add the tests for the sub modules
 
120
    suite.addTests(loader.loadTestsFromModuleNames(testmod_names))
 
121
 
118
122
    test_encodings = [
119
123
        'bzrlib.tests.blackbox.test_non_ascii',
120
124
    ]
121
125
 
122
 
    loader = TestLoader()
123
 
    suite = loader.loadTestsFromModuleNames(testmod_names) 
124
 
 
125
126
    adapter = EncodingTestAdapter()
126
127
    adapt_modules(test_encodings, adapter, loader, suite)
127
128
 
130
131
 
131
132
class ExternalBase(TestCaseWithTransport):
132
133
 
133
 
    @deprecated_method(zero_eighteen)
134
 
    def runbzr(self, args, retcode=0):
135
 
        if isinstance(args, basestring):
136
 
            args = args.split()
137
 
        return self.run_bzr(args, retcode=retcode)
138
 
 
139
134
    def check_output(self, output, *args):
140
135
        """Verify that the expected output matches what bzr says.
141
136