/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

  • Committer: John Arbash Meinel
  • Date: 2008-06-05 16:27:16 UTC
  • mfrom: (3475 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3476.
  • Revision ID: john@arbash-meinel.com-20080605162716-a3hn238tnctbfd8j
merge bzr.dev, resolve NEWS

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',
 
47
                     'bzrlib.tests.blackbox.test_alias',
46
48
                     'bzrlib.tests.blackbox.test_aliases',
47
49
                     'bzrlib.tests.blackbox.test_ancestry',
48
50
                     'bzrlib.tests.blackbox.test_annotate',
64
66
                     'bzrlib.tests.blackbox.test_export',
65
67
                     'bzrlib.tests.blackbox.test_find_merge_base',
66
68
                     'bzrlib.tests.blackbox.test_help',
 
69
                     'bzrlib.tests.blackbox.test_hooks',
67
70
                     'bzrlib.tests.blackbox.test_ignore',
68
71
                     'bzrlib.tests.blackbox.test_ignored',
69
72
                     'bzrlib.tests.blackbox.test_info',
115
118
                     'bzrlib.tests.blackbox.test_versioning',
116
119
                     'bzrlib.tests.blackbox.test_whoami',
117
120
                     ]
 
121
    # add the tests for the sub modules
 
122
    suite.addTests(loader.loadTestsFromModuleNames(testmod_names))
 
123
 
118
124
    test_encodings = [
119
125
        'bzrlib.tests.blackbox.test_non_ascii',
120
126
    ]
121
127
 
122
 
    loader = TestLoader()
123
 
    suite = loader.loadTestsFromModuleNames(testmod_names) 
124
 
 
125
128
    adapter = EncodingTestAdapter()
126
129
    adapt_modules(test_encodings, adapter, loader, suite)
127
130
 
130
133
 
131
134
class ExternalBase(TestCaseWithTransport):
132
135
 
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
136
    def check_output(self, output, *args):
140
137
        """Verify that the expected output matches what bzr says.
141
138