← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

Merge 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, TestSuite, _load_module_by_name,
27
 
                          TestCaseInTempDir, BzrTestBase)
 
26
from bzrlib.tests import (
 
27
                          _load_module_by_name,
 
28
                          TestCaseWithTransport,
 
29
                          TestSuite,
 
30
                          TestLoader,
 
31
                          )
28
32
 
29
33
def test_suite():
30
34
    testmod_names = [
31
35
                     'bzrlib.tests.blackbox.test_added',
32
36
                     'bzrlib.tests.blackbox.test_ancestry',
33
37
                     'bzrlib.tests.blackbox.test_cat',
 
38
                     'bzrlib.tests.blackbox.test_checkout',
 
39
                     'bzrlib.tests.blackbox.test_commit',
34
40
                     'bzrlib.tests.blackbox.test_diff',
35
41
                     'bzrlib.tests.blackbox.test_export',
36
42
                     'bzrlib.tests.blackbox.test_find_merge_base',
44
50
                     'bzrlib.tests.blackbox.test_selftest',
45
51
                     'bzrlib.tests.blackbox.test_status',
46
52
                     'bzrlib.tests.blackbox.test_too_much',
 
53
                     'bzrlib.tests.blackbox.test_update',
47
54
                     'bzrlib.tests.blackbox.test_upgrade',
48
55
                     'bzrlib.tests.blackbox.test_versioning',
49
56
                     ]
56
63
    return suite
57
64
 
58
65
 
59
 
class ExternalBase(TestCaseInTempDir):
 
66
class ExternalBase(TestCaseWithTransport):
60
67
 
61
68
    def runbzr(self, args, retcode=0, backtick=False):
62
69
        if isinstance(args, basestring):