~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/__init__.py

Merge bzr.dev and tree implementation tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
221
221
            self.stream.write('E')
222
222
        elif self.dots:
223
223
            self.pb.update(self._ellipsise_unimportant_words('ERROR', 13), self.testsRun, None)
 
224
            self.pb.note(self._ellipsise_unimportant_words(
 
225
                            test.id() + ': ERROR',
 
226
                            osutils.terminal_width()))
224
227
        self.stream.flush()
225
228
        if self.stop_early:
226
229
            self.stop()
234
237
            self.stream.write('F')
235
238
        elif self.dots:
236
239
            self.pb.update(self._ellipsise_unimportant_words('FAIL', 13), self.testsRun, None)
 
240
            self.pb.note(self._ellipsise_unimportant_words(
 
241
                            test.id() + ': FAIL',
 
242
                            osutils.terminal_width()))
237
243
        self.stream.flush()
238
244
        if self.stop_early:
239
245
            self.stop()
1264
1270
                   'bzrlib.tests.test_graph',
1265
1271
                   'bzrlib.tests.test_hashcache',
1266
1272
                   'bzrlib.tests.test_http',
 
1273
                   'bzrlib.tests.test_http_response',
1267
1274
                   'bzrlib.tests.test_identitymap',
 
1275
                   'bzrlib.tests.test_ignores',
1268
1276
                   'bzrlib.tests.test_inv',
1269
1277
                   'bzrlib.tests.test_knit',
1270
1278
                   'bzrlib.tests.test_lockdir',
1323
1331
        ]
1324
1332
    suite = TestUtil.TestSuite()
1325
1333
    loader = TestUtil.TestLoader()
 
1334
    suite.addTest(loader.loadTestsFromModuleNames(testmod_names))
1326
1335
    from bzrlib.transport import TransportTestProviderAdapter
1327
1336
    adapter = TransportTestProviderAdapter()
1328
1337
    adapt_modules(test_transport_implementations, adapter, loader, suite)
1329
 
    suite.addTest(loader.loadTestsFromModuleNames(testmod_names))
1330
1338
    for package in packages_to_test():
1331
1339
        suite.addTest(package.test_suite())
1332
1340
    for m in MODULES_TO_TEST: