comparison tests/run-tests.py @ 21997:93c3b3f55d59

run-tests: fix test result counts with --keyword specified or skips occurring

This preserves the current behavior that excludes ignored or skipped
tests from the number of tests run, except when tests are ignored due
to the --retest flag.

21996:947553944e92

            except KeyboardInterrupt:
                self._aborted = True
                raise
            except SkipTest, e:
                result.addSkip(self, str(e))
            except IgnoreTest, e:
                result.addIgnore(self, str(e))
            except WarnTest, e:
                result.addWarn(self, str(e))
            except self.failureException, e:
                # This differs from unittest in that we don't capture
                # the stack trace. This is for historical reasons and

            self.stop()

    # Polyfill.
    def addSkip(self, test, reason):
        self.skipped.append((test, reason))

        if self.showAll:
            self.stream.writeln('skipped %s' % reason)
        else:
            self.stream.write('s')
            self.stream.flush()

    def addIgnore(self, test, reason):
        self.ignored.append((test, reason))

        if self.showAll:
            self.stream.writeln('ignored %s' % reason)
        else:
            if reason != 'not retesting':
                self.stream.write('i')
            self.stream.flush()

    def addWarn(self, test, reason):
        self.warned.append((test, reason))

        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))
        if failed:
            self.stream.writeln('python hash seed: %s' %
                os.environ['PYTHONHASHSEED'])
        if self._runner.options.time:

21997:93c3b3f55d59

            except KeyboardInterrupt:
                self._aborted = True
                raise
            except SkipTest, e:
                result.addSkip(self, str(e))
                # The base class will have already counted this as a
                # test we "ran", but we want to exclude skipped tests
                # from those we count towards those run.
                result.testsRun -= 1
            except IgnoreTest, e:
                result.addIgnore(self, str(e))
                # As with skips, ignores also should be excluded from
                # the number of tests executed.
                result.testsRun -= 1
            except WarnTest, e:
                result.addWarn(self, str(e))
            except self.failureException, e:
                # This differs from unittest in that we don't capture
                # the stack trace. This is for historical reasons and

            self.stop()

    # Polyfill.
    def addSkip(self, test, reason):
        self.skipped.append((test, reason))
        if self.showAll:
            self.stream.writeln('skipped %s' % reason)
        else:
            self.stream.write('s')
            self.stream.flush()

    def addIgnore(self, test, reason):
        self.ignored.append((test, reason))
        if self.showAll:
            self.stream.writeln('ignored %s' % reason)
        else:
            if reason != 'not retesting':
                self.stream.write('i')
            else:
                self.testsRun += 1
            self.stream.flush()

    def addWarn(self, test, reason):
        self.warned.append((test, reason))

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

        self._runner._checkhglib('Tested')

        self.stream.writeln('# Ran %d tests, %d skipped, %d warned, %d failed.'
            % (result.testsRun,
               skipped + ignored, warned, failed))
        if failed:
            self.stream.writeln('python hash seed: %s' %
                os.environ['PYTHONHASHSEED'])
        if self._runner.options.time: