← 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 bzr.dev to resolve news conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/__init__.py
35
35
    # add the tests for this module
36
36
    suite.addTests(basic_tests)
37
37
 
 
38
    prefix = 'bzrlib.tests.blackbox.'
38
39
    testmod_names = [
39
 
                     'bzrlib.tests.blackbox.test_add',
40
 
                     'bzrlib.tests.blackbox.test_added',
41
 
                     'bzrlib.tests.blackbox.test_alias',
42
 
                     'bzrlib.tests.blackbox.test_aliases',
43
 
                     'bzrlib.tests.blackbox.test_ancestry',
44
 
                     'bzrlib.tests.blackbox.test_annotate',
45
 
                     'bzrlib.tests.blackbox.test_branch',
46
 
                     'bzrlib.tests.blackbox.test_break_lock',
47
 
                     'bzrlib.tests.blackbox.test_breakin',
48
 
                     'bzrlib.tests.blackbox.test_bound_branches',
49
 
                     'bzrlib.tests.blackbox.test_bundle_info',
50
 
                     'bzrlib.tests.blackbox.test_cat',
51
 
                     'bzrlib.tests.blackbox.test_cat_revision',
52
 
                     'bzrlib.tests.blackbox.test_check',
53
 
                     'bzrlib.tests.blackbox.test_checkout',
54
 
                     'bzrlib.tests.blackbox.test_clean_tree',
55
 
                     'bzrlib.tests.blackbox.test_command_encoding',
56
 
                     'bzrlib.tests.blackbox.test_commit',
57
 
                     'bzrlib.tests.blackbox.test_conflicts',
58
 
                     'bzrlib.tests.blackbox.test_debug',
59
 
                     'bzrlib.tests.blackbox.test_deleted',
60
 
                     'bzrlib.tests.blackbox.test_diff',
61
 
                     'bzrlib.tests.blackbox.test_dump_btree',
62
 
                     'bzrlib.tests.blackbox.test_dpush',
63
 
                     'bzrlib.tests.blackbox.test_exceptions',
64
 
                     'bzrlib.tests.blackbox.test_export',
65
 
                     'bzrlib.tests.blackbox.test_filesystem_cicp',
66
 
                     'bzrlib.tests.blackbox.test_filtered_view_ops',
67
 
                     'bzrlib.tests.blackbox.test_find_merge_base',
68
 
                     'bzrlib.tests.blackbox.test_help',
69
 
                     'bzrlib.tests.blackbox.test_hooks',
70
 
                     'bzrlib.tests.blackbox.test_ignore',
71
 
                     'bzrlib.tests.blackbox.test_ignored',
72
 
                     'bzrlib.tests.blackbox.test_info',
73
 
                     'bzrlib.tests.blackbox.test_init',
74
 
                     'bzrlib.tests.blackbox.test_inventory',
75
 
                     'bzrlib.tests.blackbox.test_join',
76
 
                     'bzrlib.tests.blackbox.test_locale',
77
 
                     'bzrlib.tests.blackbox.test_log',
78
 
                     'bzrlib.tests.blackbox.test_logformats',
79
 
                     'bzrlib.tests.blackbox.test_lookup_revision',
80
 
                     'bzrlib.tests.blackbox.test_ls',
81
 
                     'bzrlib.tests.blackbox.test_lsprof',
82
 
                     'bzrlib.tests.blackbox.test_merge',
83
 
                     'bzrlib.tests.blackbox.test_merge_directive',
84
 
                     'bzrlib.tests.blackbox.test_missing',
85
 
                     'bzrlib.tests.blackbox.test_modified',
86
 
                     'bzrlib.tests.blackbox.test_mv',
87
 
                     'bzrlib.tests.blackbox.test_nick',
88
 
                     'bzrlib.tests.blackbox.test_non_ascii',
89
 
                     'bzrlib.tests.blackbox.test_outside_wt',
90
 
                     'bzrlib.tests.blackbox.test_pack',
91
 
                     'bzrlib.tests.blackbox.test_pull',
92
 
                     'bzrlib.tests.blackbox.test_push',
93
 
                     'bzrlib.tests.blackbox.test_reconcile',
94
 
                     'bzrlib.tests.blackbox.test_reconfigure',
95
 
                     'bzrlib.tests.blackbox.test_reference',
96
 
                     'bzrlib.tests.blackbox.test_remerge',
97
 
                     'bzrlib.tests.blackbox.test_remove',
98
 
                     'bzrlib.tests.blackbox.test_re_sign',
99
 
                     'bzrlib.tests.blackbox.test_remove_tree',
100
 
                     'bzrlib.tests.blackbox.test_revert',
101
 
                     'bzrlib.tests.blackbox.test_revno',
102
 
                     'bzrlib.tests.blackbox.test_revision_history',
103
 
                     'bzrlib.tests.blackbox.test_revision_info',
104
 
                     'bzrlib.tests.blackbox.test_rmbranch',
105
 
                     'bzrlib.tests.blackbox.test_selftest',
106
 
                     'bzrlib.tests.blackbox.test_send',
107
 
                     'bzrlib.tests.blackbox.test_serve',
108
 
                     'bzrlib.tests.blackbox.test_shared_repository',
109
 
                     'bzrlib.tests.blackbox.test_shelve',
110
 
                     'bzrlib.tests.blackbox.test_sign_my_commits',
111
 
                     'bzrlib.tests.blackbox.test_split',
112
 
                     'bzrlib.tests.blackbox.test_status',
113
 
                     'bzrlib.tests.blackbox.test_switch',
114
 
                     'bzrlib.tests.blackbox.test_tags',
115
 
                     'bzrlib.tests.blackbox.test_testament',
116
 
                     'bzrlib.tests.blackbox.test_too_much',
117
 
                     'bzrlib.tests.blackbox.test_uncommit',
118
 
                     'bzrlib.tests.blackbox.test_unknowns',
119
 
                     'bzrlib.tests.blackbox.test_update',
120
 
                     'bzrlib.tests.blackbox.test_upgrade',
121
 
                     'bzrlib.tests.blackbox.test_version',
122
 
                     'bzrlib.tests.blackbox.test_version_info',
123
 
                     'bzrlib.tests.blackbox.test_versioning',
124
 
                     'bzrlib.tests.blackbox.test_view',
125
 
                     'bzrlib.tests.blackbox.test_whoami',
 
40
                     'test_add',
 
41
                     'test_added',
 
42
                     'test_alias',
 
43
                     'test_aliases',
 
44
                     'test_ancestry',
 
45
                     'test_annotate',
 
46
                     'test_branch',
 
47
                     'test_break_lock',
 
48
                     'test_breakin',
 
49
                     'test_bound_branches',
 
50
                     'test_bundle_info',
 
51
                     'test_cat',
 
52
                     'test_cat_revision',
 
53
                     'test_check',
 
54
                     'test_checkout',
 
55
                     'test_clean_tree',
 
56
                     'test_command_encoding',
 
57
                     'test_commit',
 
58
                     'test_config',
 
59
                     'test_conflicts',
 
60
                     'test_debug',
 
61
                     'test_deleted',
 
62
                     'test_diff',
 
63
                     'test_dump_btree',
 
64
                     'test_dpush',
 
65
                     'test_exceptions',
 
66
                     'test_export',
 
67
                     'test_filesystem_cicp',
 
68
                     'test_filtered_view_ops',
 
69
                     'test_find_merge_base',
 
70
                     'test_help',
 
71
                     'test_hooks',
 
72
                     'test_ignore',
 
73
                     'test_ignored',
 
74
                     'test_info',
 
75
                     'test_init',
 
76
                     'test_inventory',
 
77
                     'test_join',
 
78
                     'test_locale',
 
79
                     'test_log',
 
80
                     'test_logformats',
 
81
                     'test_lookup_revision',
 
82
                     'test_ls',
 
83
                     'test_lsprof',
 
84
                     'test_merge',
 
85
                     'test_merge_directive',
 
86
                     'test_missing',
 
87
                     'test_modified',
 
88
                     'test_mv',
 
89
                     'test_nick',
 
90
                     'test_non_ascii',
 
91
                     'test_outside_wt',
 
92
                     'test_pack',
 
93
                     'test_pull',
 
94
                     'test_push',
 
95
                     'test_reconcile',
 
96
                     'test_reconfigure',
 
97
                     'test_reference',
 
98
                     'test_remerge',
 
99
                     'test_remove',
 
100
                     'test_re_sign',
 
101
                     'test_remove_tree',
 
102
                     'test_resolve',
 
103
                     'test_revert',
 
104
                     'test_revno',
 
105
                     'test_revision_history',
 
106
                     'test_revision_info',
 
107
                     'test_rmbranch',
 
108
                     'test_script',
 
109
                     'test_selftest',
 
110
                     'test_send',
 
111
                     'test_serve',
 
112
                     'test_shared_repository',
 
113
                     'test_shelve',
 
114
                     'test_sign_my_commits',
 
115
                     'test_split',
 
116
                     'test_status',
 
117
                     'test_switch',
 
118
                     'test_tags',
 
119
                     'test_testament',
 
120
                     'test_too_much',
 
121
                     'test_uncommit',
 
122
                     'test_unknowns',
 
123
                     'test_update',
 
124
                     'test_upgrade',
 
125
                     'test_version',
 
126
                     'test_version_info',
 
127
                     'test_versioning',
 
128
                     'test_view',
 
129
                     'test_whoami',
126
130
                     ]
127
131
    # add the tests for the sub modules
128
 
    suite.addTests(loader.loadTestsFromModuleNames(testmod_names))
 
132
    suite.addTests(loader.loadTestsFromModuleNames(
 
133
            [prefix + module_name for module_name in testmod_names]))
129
134
    return suite
130
135
 
131
136