← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_selftest.py

  • Committer: John Arbash Meinel
  • Date: 2006-07-14 16:15:17 UTC
  • mto: This revision was merged to the branch mainline in revision 1870.
  • Revision ID: john@arbash-meinel.com-20060714161517-ce6e74d825379415
Print out when a test fails in non verbose mode, run transport tests later

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_selftest.py
22
22
import unittest
23
23
import warnings
24
24
 
 
25
from bzrlib import osutils
25
26
import bzrlib
26
27
from bzrlib.progress import _BaseProgressBar
27
28
from bzrlib.tests import (
395
396
    def clear(self):
396
397
        self.calls.append(('clear',))
397
398
 
 
399
    def note(self, msg, *args):
 
400
        self.calls.append(('note', msg, args))
 
401
 
398
402
 
399
403
class TestTestResult(TestCase):
400
404
 
405
409
        mypb = MockProgress()
406
410
        mypb.update('Running tests', 0, 4)
407
411
        last_calls = mypb.calls[:]
 
412
 
408
413
        result = bzrlib.tests._MyResult(self._log_file,
409
414
                                        descriptions=0,
410
415
                                        verbosity=1,
411
416
                                        pb=mypb)
412
417
        self.assertEqual(last_calls, mypb.calls)
413
418
 
 
419
        def shorten(s):
 
420
            """Shorten a string based on the terminal width"""
 
421
            return result._ellipsise_unimportant_words(s,
 
422
                                 osutils.terminal_width())
 
423
 
414
424
        # an error 
415
425
        result.startTest(dummy_test)
416
426
        # starting a test prints the test name
417
 
        self.assertEqual(last_calls + [('update', '...tyle_quiet', 0, None)], mypb.calls)
418
 
        last_calls = mypb.calls[:]
 
427
        last_calls += [('update', '...tyle_quiet', 0, None)]
 
428
        self.assertEqual(last_calls, mypb.calls)
419
429
        result.addError(dummy_test, dummy_error)
420
 
        self.assertEqual(last_calls + [('update', 'ERROR        ', 1, None)], mypb.calls)
421
 
        last_calls = mypb.calls[:]
 
430
        last_calls += [('update', 'ERROR        ', 1, None),
 
431
                       ('note', shorten(dummy_test.id() + ': ERROR'), ())
 
432
                      ]
 
433
        self.assertEqual(last_calls, mypb.calls)
422
434
 
423
435
        # a failure
424
436
        result.startTest(dummy_test)
425
 
        self.assertEqual(last_calls + [('update', '...tyle_quiet', 1, None)], mypb.calls)
426
 
        last_calls = mypb.calls[:]
 
437
        last_calls += [('update', '...tyle_quiet', 1, None)]
 
438
        self.assertEqual(last_calls, mypb.calls)
 
439
        last_calls += [('update', 'FAIL         ', 2, None),
 
440
                       ('note', shorten(dummy_test.id() + ': FAIL'), ())
 
441
                      ]
427
442
        result.addFailure(dummy_test, dummy_error)
428
 
        self.assertEqual(last_calls + [('update', 'FAIL         ', 2, None)], mypb.calls)
429
 
        last_calls = mypb.calls[:]
 
443
        self.assertEqual(last_calls, mypb.calls)
430
444
 
431
445
        # a success
432
446
        result.startTest(dummy_test)
433
 
        self.assertEqual(last_calls + [('update', '...tyle_quiet', 2, None)], mypb.calls)
434
 
        last_calls = mypb.calls[:]
 
447
        last_calls += [('update', '...tyle_quiet', 2, None)]
 
448
        self.assertEqual(last_calls, mypb.calls)
435
449
        result.addSuccess(dummy_test)
436
 
        self.assertEqual(last_calls + [('update', 'OK           ', 3, None)], mypb.calls)
437
 
        last_calls = mypb.calls[:]
 
450
        last_calls += [('update', 'OK           ', 3, None)]
 
451
        self.assertEqual(last_calls, mypb.calls)
438
452
 
439
453
        # a skip
440
454
        result.startTest(dummy_test)
441
 
        self.assertEqual(last_calls + [('update', '...tyle_quiet', 3, None)], mypb.calls)
442
 
        last_calls = mypb.calls[:]
 
455
        last_calls += [('update', '...tyle_quiet', 3, None)]
 
456
        self.assertEqual(last_calls, mypb.calls)
443
457
        result.addSkipped(dummy_test, dummy_error)
444
 
        self.assertEqual(last_calls + [('update', 'SKIP         ', 4, None)], mypb.calls)
445
 
        last_calls = mypb.calls[:]
 
458
        last_calls += [('update', 'SKIP         ', 4, None)]
 
459
        self.assertEqual(last_calls, mypb.calls)
446
460
 
447
461
    def test_elapsed_time_with_benchmarking(self):
448
462
        result = bzrlib.tests._MyResult(self._log_file,