← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/__init__.py

  • Committer: Martin Pool
  • Date: 2009-07-22 06:00:45 UTC
  • mfrom: (4557 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4558.
  • Revision ID: mbp@sourcefrog.net-20090722060045-035t1zgpicwfyk93
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/__init__.py
196
196
    def _testTimeString(self, testCase):
197
197
        benchmark_time = self._extractBenchmarkTime(testCase)
198
198
        if benchmark_time is not None:
199
 
            return "%s/%s" % (
200
 
                self._formatTime(benchmark_time),
201
 
                self._elapsedTestTimeString())
 
199
            return self._formatTime(benchmark_time) + "*"
202
200
        else:
203
 
            return "           %s" % self._elapsedTestTimeString()
 
201
            return self._elapsedTestTimeString()
204
202
 
205
203
    def _formatTime(self, seconds):
206
204
        """Format seconds as milliseconds with leading spaces."""
347
345
            self.stream.write("%s: " % flavour)
348
346
            self.stream.writeln(self.getDescription(test))
349
347
            if getattr(test, '_get_log', None) is not None:
350
 
                self.stream.write('\n')
351
 
                self.stream.write(
352
 
                        ('vvvv[log from %s]' % test.id()).ljust(78,'-'))
353
 
                self.stream.write('\n')
354
 
                self.stream.write(test._get_log())
355
 
                self.stream.write('\n')
356
 
                self.stream.write(
357
 
                        ('^^^^[log from %s]' % test.id()).ljust(78,'-'))
358
 
                self.stream.write('\n')
 
348
                log_contents = test._get_log()
 
349
                if log_contents:
 
350
                    self.stream.write('\n')
 
351
                    self.stream.write(
 
352
                            ('vvvv[log from %s]' % test.id()).ljust(78,'-'))
 
353
                    self.stream.write('\n')
 
354
                    self.stream.write(log_contents)
 
355
                    self.stream.write('\n')
 
356
                    self.stream.write(
 
357
                            ('^^^^[log from %s]' % test.id()).ljust(78,'-'))
 
358
                    self.stream.write('\n')
359
359
            self.stream.writeln(self.separator2)
360
360
            self.stream.writeln("%s" % err)
361
361
 
487
487
    def report_test_start(self, test):
488
488
        self.count += 1
489
489
        name = self._shortened_test_description(test)
490
 
        # width needs space for 6 char status, plus 1 for slash, plus 2 10-char
491
 
        # numbers, plus a trailing blank
 
490
        # width needs space for 6 char status, plus 1 for slash, plus an
 
491
        # 11-char time string, plus a trailing blank
492
492
        # when NUMBERED_DIRS: plus 5 chars on test number, plus 1 char on space
493
493
        self.stream.write(self._ellipsize_to_right(name,
494
 
                          osutils.terminal_width()-30))
 
494
                          osutils.terminal_width()-18))
495
495
        self.stream.flush()
496
496
 
497
497
    def _error_summary(self, err):