/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/__init__.py

  • Committer: Andrew Bennetts
  • Date: 2010-10-08 01:47:43 UTC
  • mfrom: (5469 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5471.
  • Revision ID: andrew.bennetts@canonical.com-20101008014743-6lp4arivq5jzcthx
Merge lp:bzr.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/__init__.py
260
260
 
261
261
    def _elapsedTestTimeString(self):
262
262
        """Return a time string for the overall time the current test has taken."""
263
 
        return self._formatTime(time.time() - self._start_time)
 
263
        return self._formatTime(self._delta_to_float(
 
264
            self._now() - self._start_datetime))
264
265
 
265
266
    def _testTimeString(self, testCase):
266
267
        benchmark_time = self._extractBenchmarkTime(testCase)
315
316
 
316
317
    def _recordTestStartTime(self):
317
318
        """Record that a test has started."""
318
 
        self._start_time = time.time()
 
319
        self._start_datetime = self._now()
319
320
 
320
321
    def addError(self, test, err):
321
322
        """Tell result that test finished with an error.