← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/__init__.py

merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/__init__.py
1
1
# Copyright (C) 2005, 2006 by Canonical Ltd
2
 
 
 
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
7
 
 
 
7
#
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
11
# GNU General Public License for more details.
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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
109
109
    import bzrlib.tests.bzrdir_implementations
110
110
    import bzrlib.tests.interrepository_implementations
111
111
    import bzrlib.tests.interversionedfile_implementations
 
112
    import bzrlib.tests.intertree_implementations
112
113
    import bzrlib.tests.repository_implementations
113
114
    import bzrlib.tests.revisionstore_implementations
 
115
    import bzrlib.tests.tree_implementations
114
116
    import bzrlib.tests.workingtree_implementations
115
117
    return [
116
118
            bzrlib.doc,
119
121
            bzrlib.tests.bzrdir_implementations,
120
122
            bzrlib.tests.interrepository_implementations,
121
123
            bzrlib.tests.interversionedfile_implementations,
 
124
            bzrlib.tests.intertree_implementations,
122
125
            bzrlib.tests.repository_implementations,
123
126
            bzrlib.tests.revisionstore_implementations,
 
127
            bzrlib.tests.tree_implementations,
124
128
            bzrlib.tests.workingtree_implementations,
125
129
            ]
126
130
 
219
223
            self.stream.write('E')
220
224
        elif self.dots:
221
225
            self.pb.update(self._ellipsise_unimportant_words('ERROR', 13), self.testsRun, None)
 
226
            self.pb.note(self._ellipsise_unimportant_words(
 
227
                            test.id() + ': ERROR',
 
228
                            osutils.terminal_width()))
222
229
        self.stream.flush()
223
230
        if self.stop_early:
224
231
            self.stop()
232
239
            self.stream.write('F')
233
240
        elif self.dots:
234
241
            self.pb.update(self._ellipsise_unimportant_words('FAIL', 13), self.testsRun, None)
 
242
            self.pb.note(self._ellipsise_unimportant_words(
 
243
                            test.id() + ': FAIL',
 
244
                            osutils.terminal_width()))
235
245
        self.stream.flush()
236
246
        if self.stop_early:
237
247
            self.stop()
1255
1265
                   'bzrlib.tests.test_decorators',
1256
1266
                   'bzrlib.tests.test_diff',
1257
1267
                   'bzrlib.tests.test_doc_generate',
1258
 
                   'bzrlib.tests.test_emptytree',
1259
1268
                   'bzrlib.tests.test_errors',
1260
1269
                   'bzrlib.tests.test_escaped_store',
1261
1270
                   'bzrlib.tests.test_fetch',
1263
1272
                   'bzrlib.tests.test_graph',
1264
1273
                   'bzrlib.tests.test_hashcache',
1265
1274
                   'bzrlib.tests.test_http',
 
1275
                   'bzrlib.tests.test_http_response',
1266
1276
                   'bzrlib.tests.test_identitymap',
 
1277
                   'bzrlib.tests.test_ignores',
1267
1278
                   'bzrlib.tests.test_inv',
1268
1279
                   'bzrlib.tests.test_knit',
1269
1280
                   'bzrlib.tests.test_lockdir',
1305
1316
                   'bzrlib.tests.test_transactions',
1306
1317
                   'bzrlib.tests.test_transform',
1307
1318
                   'bzrlib.tests.test_transport',
 
1319
                   'bzrlib.tests.test_tree',
1308
1320
                   'bzrlib.tests.test_tsort',
1309
1321
                   'bzrlib.tests.test_tuned_gzip',
1310
1322
                   'bzrlib.tests.test_ui',
1322
1334
        ]
1323
1335
    suite = TestUtil.TestSuite()
1324
1336
    loader = TestUtil.TestLoader()
 
1337
    suite.addTest(loader.loadTestsFromModuleNames(testmod_names))
1325
1338
    from bzrlib.transport import TransportTestProviderAdapter
1326
1339
    adapter = TransportTestProviderAdapter()
1327
1340
    adapt_modules(test_transport_implementations, adapter, loader, suite)
1328
 
    suite.addTest(loader.loadTestsFromModuleNames(testmod_names))
1329
1341
    for package in packages_to_test():
1330
1342
        suite.addTest(package.test_suite())
1331
1343
    for m in MODULES_TO_TEST: