/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 bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/__init__.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
18
18
"""Black-box tests for bzr.
19
19
 
20
20
These check that it behaves properly when it's invoked through the regular
21
 
command-line interface. This doesn't actually run a new interpreter but 
 
21
command-line interface. This doesn't actually run a new interpreter but
22
22
rather starts again from the run_bzr function.
23
23
"""
24
24
 
25
 
import sys
26
 
 
27
 
from bzrlib.tests import (
28
 
                          adapt_modules,
29
 
                          TestCaseWithTransport,
30
 
                          TestSuite,
31
 
                          TestLoader,
32
 
                          iter_suite_tests,
33
 
                          )
34
 
from bzrlib.tests.EncodingAdapter import EncodingTestAdapter
35
 
from bzrlib.symbol_versioning import (
36
 
    deprecated_method,
37
 
    zero_eighteen,
38
 
    )
39
 
import bzrlib.ui as ui
40
 
 
41
 
 
42
 
def test_suite():
 
25
 
 
26
from bzrlib.tests import TestCaseWithTransport
 
27
 
 
28
 
 
29
def load_tests(basic_tests, module, loader):
 
30
    suite = loader.suiteClass()
 
31
    # add the tests for this module
 
32
    suite.addTests(basic_tests)
 
33
 
43
34
    testmod_names = [
44
35
                     'bzrlib.tests.blackbox.test_add',
45
36
                     'bzrlib.tests.blackbox.test_added',
 
37
                     'bzrlib.tests.blackbox.test_alias',
46
38
                     'bzrlib.tests.blackbox.test_aliases',
47
39
                     'bzrlib.tests.blackbox.test_ancestry',
48
40
                     'bzrlib.tests.blackbox.test_annotate',
50
42
                     'bzrlib.tests.blackbox.test_break_lock',
51
43
                     'bzrlib.tests.blackbox.test_breakin',
52
44
                     'bzrlib.tests.blackbox.test_bound_branches',
 
45
                     'bzrlib.tests.blackbox.test_bundle_info',
53
46
                     'bzrlib.tests.blackbox.test_cat',
54
47
                     'bzrlib.tests.blackbox.test_cat_revision',
 
48
                     'bzrlib.tests.blackbox.test_check',
55
49
                     'bzrlib.tests.blackbox.test_checkout',
 
50
                     'bzrlib.tests.blackbox.test_clean_tree',
56
51
                     'bzrlib.tests.blackbox.test_command_encoding',
57
52
                     'bzrlib.tests.blackbox.test_commit',
58
53
                     'bzrlib.tests.blackbox.test_conflicts',
59
54
                     'bzrlib.tests.blackbox.test_debug',
60
55
                     'bzrlib.tests.blackbox.test_diff',
 
56
                     'bzrlib.tests.blackbox.test_dump_btree',
 
57
                     'bzrlib.tests.blackbox.test_dpush',
61
58
                     'bzrlib.tests.blackbox.test_exceptions',
62
59
                     'bzrlib.tests.blackbox.test_export',
 
60
                     'bzrlib.tests.blackbox.test_filesystem_cicp',
 
61
                     'bzrlib.tests.blackbox.test_filtered_view_ops',
63
62
                     'bzrlib.tests.blackbox.test_find_merge_base',
64
63
                     'bzrlib.tests.blackbox.test_help',
 
64
                     'bzrlib.tests.blackbox.test_hooks',
65
65
                     'bzrlib.tests.blackbox.test_ignore',
66
66
                     'bzrlib.tests.blackbox.test_ignored',
67
67
                     'bzrlib.tests.blackbox.test_info',
76
76
                     'bzrlib.tests.blackbox.test_merge',
77
77
                     'bzrlib.tests.blackbox.test_merge_directive',
78
78
                     'bzrlib.tests.blackbox.test_missing',
 
79
                     'bzrlib.tests.blackbox.test_modified',
79
80
                     'bzrlib.tests.blackbox.test_mv',
80
81
                     'bzrlib.tests.blackbox.test_nick',
 
82
                     'bzrlib.tests.blackbox.test_non_ascii',
81
83
                     'bzrlib.tests.blackbox.test_outside_wt',
82
84
                     'bzrlib.tests.blackbox.test_pack',
83
85
                     'bzrlib.tests.blackbox.test_pull',
84
86
                     'bzrlib.tests.blackbox.test_push',
85
87
                     'bzrlib.tests.blackbox.test_reconcile',
 
88
                     'bzrlib.tests.blackbox.test_reconfigure',
 
89
                     'bzrlib.tests.blackbox.test_reference',
86
90
                     'bzrlib.tests.blackbox.test_remerge',
87
91
                     'bzrlib.tests.blackbox.test_remove',
88
92
                     'bzrlib.tests.blackbox.test_re_sign',
95
99
                     'bzrlib.tests.blackbox.test_send',
96
100
                     'bzrlib.tests.blackbox.test_serve',
97
101
                     'bzrlib.tests.blackbox.test_shared_repository',
 
102
                     'bzrlib.tests.blackbox.test_shelve',
98
103
                     'bzrlib.tests.blackbox.test_sign_my_commits',
99
104
                     'bzrlib.tests.blackbox.test_split',
100
105
                     'bzrlib.tests.blackbox.test_status',
 
106
                     'bzrlib.tests.blackbox.test_switch',
101
107
                     'bzrlib.tests.blackbox.test_tags',
102
108
                     'bzrlib.tests.blackbox.test_testament',
103
109
                     'bzrlib.tests.blackbox.test_too_much',
104
110
                     'bzrlib.tests.blackbox.test_uncommit',
 
111
                     'bzrlib.tests.blackbox.test_unknowns',
105
112
                     'bzrlib.tests.blackbox.test_update',
106
113
                     'bzrlib.tests.blackbox.test_upgrade',
107
114
                     'bzrlib.tests.blackbox.test_version',
108
115
                     'bzrlib.tests.blackbox.test_version_info',
109
116
                     'bzrlib.tests.blackbox.test_versioning',
 
117
                     'bzrlib.tests.blackbox.test_view',
110
118
                     'bzrlib.tests.blackbox.test_whoami',
111
119
                     ]
112
 
    test_encodings = [
113
 
        'bzrlib.tests.blackbox.test_non_ascii',
114
 
    ]
115
 
 
116
 
    loader = TestLoader()
117
 
    suite = loader.loadTestsFromModuleNames(testmod_names) 
118
 
 
119
 
    adapter = EncodingTestAdapter()
120
 
    adapt_modules(test_encodings, adapter, loader, suite)
121
 
 
 
120
    # add the tests for the sub modules
 
121
    suite.addTests(loader.loadTestsFromModuleNames(testmod_names))
122
122
    return suite
123
123
 
124
124
 
125
125
class ExternalBase(TestCaseWithTransport):
126
126
 
127
 
    @deprecated_method(zero_eighteen)
128
 
    def runbzr(self, args, retcode=0):
129
 
        if isinstance(args, basestring):
130
 
            args = args.split()
131
 
        return self.run_bzr(args, retcode=retcode)
132
 
 
133
127
    def check_output(self, output, *args):
134
128
        """Verify that the expected output matches what bzr says.
135
129