← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/__init__.py

  • Committer: Martin Pool
  • Date: 2005-11-10 23:42:06 UTC
  • mto: (1185.33.43 bzr.dev)
  • mto: This revision was merged to the branch mainline in revision 1512.
  • Revision ID: mbp@sourcefrog.net-20051110234206-2fa4ada64c9cb8a0
Nicer display of verbose test results and progress

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/__init__.py
64
64
 
65
65
 
66
66
class _MyResult(unittest._TextTestResult):
67
 
    """
68
 
    Custom TestResult.
 
67
    """Custom TestResult.
69
68
 
70
69
    No special behaviour for now.
71
70
    """
72
71
 
 
72
    # assumes 80-column window, less 'ERROR 99999ms' = 13ch
73
73
    def _elapsedTime(self):
74
 
        return "(Took %.3fs)" % (time.time() - self._start_time)
 
74
        return "%5dms" % (1000 * (time.time() - self._start_time))
75
75
 
76
76
    def startTest(self, test):
77
77
        unittest.TestResult.startTest(self, test)
78
78
        # TODO: Maybe show test.shortDescription somewhere?
79
79
        what = test.shortDescription() or test.id()        
 
80
        pref = 'bzrlib.selftest.'
 
81
        if what.startswith(pref):
 
82
            what = what[len(pref):]
80
83
        if self.showAll:
81
 
            self.stream.write('%-70.70s' % what)
 
84
            self.stream.write('%-65.65s' % what)
82
85
        self.stream.flush()
83
86
        self._start_time = time.time()
84
87
 
93
96
    def addFailure(self, test, err):
94
97
        unittest.TestResult.addFailure(self, test, err)
95
98
        if self.showAll:
96
 
            self.stream.writeln("FAIL %s" % self._elapsedTime())
 
99
            self.stream.writeln(" FAIL %s" % self._elapsedTime())
97
100
        elif self.dots:
98
101
            self.stream.write('F')
99
102
        self.stream.flush()
100
103
 
101
104
    def addSuccess(self, test):
102
105
        if self.showAll:
103
 
            self.stream.writeln('OK %s' % self._elapsedTime())
 
106
            self.stream.writeln('   OK %s' % self._elapsedTime())
104
107
        elif self.dots:
105
108
            self.stream.write('~')
106
109
        self.stream.flush()