run-tests: fixes the number of tests ran when '--retest' is enabled
authoranuraggoel <anurag.dsps@gmail.com>
Thu, 12 Jun 2014 03:20:28 +0530
changeset 21740 2b3b60031b6f
parent 21739 11e5ad038a7b
child 21741 02cd29156d5d
run-tests: fixes the number of tests ran when '--retest' is enabled This patch fixes a regression recently introduced by a refactoring. (see 92a6b16c9186 and about 200 previous changesets from Gregory Szorc) While retesting, that is when '--retest' is enabled, only failure tests run and others either skipped or ignored. During retesting, "result.testsRun" holds the count of failure test that has run. But as while printing output, we have subtracted the skipped and ignored count from "result.testsRun". Therefore, to make the count remain the same, we need to add skipped and ignored count before printing.
tests/run-tests.py
--- a/tests/run-tests.py	Thu Jun 12 02:36:52 2014 +0530
+++ b/tests/run-tests.py	Thu Jun 12 03:20:28 2014 +0530
@@ -1316,6 +1316,14 @@
 
         self._runner._checkhglib('Tested')
 
+        # When '--retest' is enabled, only failure tests run. At this point
+        # "result.testsRun" holds the count of failure test that has run. But
+        # as while printing output, we have subtracted the skipped and ignored
+        # count from "result.testsRun". Therefore, to make the count remain
+        # the same, we need to add skipped and ignored count in here.
+        if self._runner.options.retest:
+            result.testsRun = result.testsRun + skipped + ignored
+
         # This differs from unittest's default output in that we don't count
         # skipped and ignored tests as part of the total test count.
         self.stream.writeln('# Ran %d tests, %d skipped, %d warned, %d failed.'