comparison tests/run-tests.py @ 21740:2b3b60031b6f

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.

21739:11e5ad038a7b

        for test, msg in result.errors:
            self.stream.writeln('Errored %s: %s' % (test.name, msg))

        self._runner._checkhglib('Tested')

        # 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.'
            % (result.testsRun - skipped - ignored,
               skipped + ignored, warned, failed))

21740:2b3b60031b6f

        for test, msg in result.errors:
            self.stream.writeln('Errored %s: %s' % (test.name, msg))

        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.'
            % (result.testsRun - skipped - ignored,
               skipped + ignored, warned, failed))