add a public addDuration method to TestResult

giampaolo · Apr 2, 2023 · Mar 10, 2019 · Mar 10, 2019 · Mar 10, 2019 · Mar 10, 2019
commit d88087ea57f116d754b92c5189d75777f717f4ef
diff --git a/Lib/unittest/case.py b/Lib/unittest/case.py
@@ -605,6 +605,15 @@ def _addUnexpectedSuccess(self, result):
         else:
             addUnexpectedSuccess(self)
 
+    def _addDuration(self, result, start_time):
+        try:
+            addDuration = result.addDuration
+        except AttributeError:
+            warnings.warn("TestResult has no addDuration method",
+                          RuntimeWarning)
+        else:
+            addDuration(self, time.perf_counter() - start_time)
+
     def run(self, result=None):
         orig_result = result
         if result is None:
@@ -640,27 +649,29 @@ def run(self, result=None):
                 try:
                     self.setUp()
                 except Exception:
-                    result.runTime = time.perf_counter() - start_time
+                    self._addDuration(result, start_time)
                     raise
             if outcome.success:
                 outcome.expecting_failure = expecting_failure
                 with outcome.testPartExecutor(self, isTest=True):
                     try:
                         testMethod()
                     except Exception:
-                        result.runTime = time.perf_counter() - start_time
+                        self._addDuration(result, start_time)
                         raise
                 outcome.expecting_failure = False
                 with outcome.testPartExecutor(self):
                     try:
                         self.tearDown()
                     except Exception:
-                        result.runTime = time.perf_counter() - start_time
+                        self._addDuration(result, start_time)
                         raise
 
-            result.runTime = time.perf_counter() - start_time
+            try:
+                self.doCleanups()
+            finally:
+                self._addDuration(result, start_time)
 
-            self.doCleanups()
             for test, reason in outcome.skipped:
                 self._addSkip(result, test, reason)
             self._feedErrorsToResult(result, outcome.errors)
@@ -675,8 +686,6 @@ def run(self, result=None):
             return result
         finally:
             result.stopTest(self)
-            if result.durations is not None:
-                result.addDuration(self, result.runTime)
             if orig_result is None:
                 stopTestRun = getattr(result, 'stopTestRun', None)
                 if stopTestRun is not None:

diff --git a/Lib/unittest/result.py b/Lib/unittest/result.py
@@ -159,6 +159,7 @@ def addUnexpectedSuccess(self, test):
         self.unexpectedSuccesses.append(test)
 
     def addDuration(self, test, elapsed):
+        """Called when a test finished to run, regardless of its outcome."""
         self.collectedDurations.append((test, elapsed))
 
     def wasSuccessful(self):

diff --git a/Lib/unittest/runner.py b/Lib/unittest/runner.py
@@ -40,12 +40,12 @@ def __init__(self, stream, descriptions, verbosity, *, durations=None):
         self.showAll = verbosity > 1
         self.dots = verbosity == 1
         self.descriptions = descriptions
-        self.runTime = None
         self.durations = durations
+        self._lastDuration = None
 
-    def _fmtRes(self, s):
+    def _formatDuration(self, s):
         if self.durations is not None:
-            return "[%.3fs] %s" % (self.runTime, s)
+            return "[%.3fs] %s" % (self._lastDuration, s)
         else:
             return s
 
@@ -66,51 +66,56 @@ def startTest(self, test):
     def addSuccess(self, test):
         super(TextTestResult, self).addSuccess(test)
         if self.showAll:
-            self.stream.writeln(self._fmtRes("ok"))
+            self.stream.writeln(self._formatDuration("ok"))
         elif self.dots:
             self.stream.write('.')
             self.stream.flush()
 
     def addError(self, test, err):
         super(TextTestResult, self).addError(test, err)
         if self.showAll:
-            self.stream.writeln(self._fmtRes("ERROR"))
+            self.stream.writeln(self._formatDuration("ERROR"))
         elif self.dots:
             self.stream.write('E')
             self.stream.flush()
 
     def addFailure(self, test, err):
         super(TextTestResult, self).addFailure(test, err)
         if self.showAll:
-            self.stream.writeln(self._fmtRes("FAIL"))
+            self.stream.writeln(self._formatDuration("FAIL"))
         elif self.dots:
             self.stream.write('F')
             self.stream.flush()
 
     def addSkip(self, test, reason):
         super(TextTestResult, self).addSkip(test, reason)
         if self.showAll:
-            self.stream.writeln(self._fmtRes("skipped {0!r}".format(reason)))
+            self.stream.writeln(
+                self._formatDuration("skipped {0!r}".format(reason)))
         elif self.dots:
             self.stream.write("s")
             self.stream.flush()
 
     def addExpectedFailure(self, test, err):
         super(TextTestResult, self).addExpectedFailure(test, err)
         if self.showAll:
-            self.stream.writeln(self._fmtRes("expected failure"))
+            self.stream.writeln(self._formatDuration("expected failure"))
         elif self.dots:
             self.stream.write("x")
             self.stream.flush()
 
     def addUnexpectedSuccess(self, test):
         super(TextTestResult, self).addUnexpectedSuccess(test)
         if self.showAll:
-            self.stream.writeln(self._fmtRes("unexpected success"))
+            self.stream.writeln(self._formatDuration("unexpected success"))
         elif self.dots:
             self.stream.write("u")
             self.stream.flush()
 
+    def addDuration(self, test, duration):
+        super(TextTestResult, self).addDuration(test, duration)
+        self._lastDuration = duration
+
     def printErrors(self):
         if self.dots or self.showAll:
             self.stream.writeln()
@@ -135,7 +140,7 @@ class TextTestRunner(object):
 
     def __init__(self, stream=None, descriptions=True, verbosity=1,
                  failfast=False, buffer=False, resultclass=None, warnings=None,
-                 *, tb_locals=False, durations=False):
+                 *, tb_locals=False, durations=None):
         """Construct a TextTestRunner.
 
         Subclasses should accept **kwargs to ensure compatibility as the
@@ -176,7 +181,7 @@ def _printDurations(self, result):
             if self.verbosity < 2 and elapsed < 0.001:
                 hidden = True
                 continue
-            self.stream.writeln("%-12s %s" % ("%.3fs" % elapsed, test))
+            self.stream.writeln("%-10s %s" % ("%.3fs" % elapsed, test))
         if hidden:
             self.stream.writeln(
                 "\n(0.000 durations hidden.  Use -v to show these durations.)")