comparison tests/run-tests.py @ 21530:78289625e986

run-tests: make retest a named argument of TestSuite.__init__

21529:117e027390ab

class TestSuite(unittest.TestSuite):
    """Custom unitest TestSuite that knows how to execute Mercurial tests."""

    def __init__(self, runner, jobs=1, whitelist=None, blacklist=None,
                 *args, **kwargs):
        """Create a new instance that can run tests with a configuration.

        jobs specifies the number of jobs to run concurrently. Each test
        executes on its own thread. Tests actually spawn new processes, so

        blacklisted, respectively. These arguments don't belong in TestSuite.
        Instead, whitelist and blacklist should be handled by the thing that
        populates the TestSuite with tests. They are present to preserve
        backwards compatible behavior which reports skipped tests as part
        of the results.
        """
        super(TestSuite, self).__init__(*args, **kwargs)

        self._runner = runner
        self._jobs = jobs
        self._whitelist = whitelist
        self._blacklist = blacklist

    def run(self, result):
        options = self._runner.options

        # We have a number of filters that need to be applied. We do this

            if not (self._whitelist and test.name in self._whitelist):
                if self._blacklist and test.name in self._blacklist:
                    result.addSkip(test, 'blacklisted')
                    continue

                if options.retest and not os.path.exists(test.errpath):
                    result.addIgnore(test, 'not retesting')
                    continue

                if options.keywords:
                    f = open(test.path)

            warned = False

            suite = TestSuite(self, jobs=self.options.jobs,
                              whitelist=self.options.whitelisted,
                              blacklist=self.options.blacklist,
                              tests=tests)
            verbosity = 1
            if self.options.verbose:
                verbosity = 2
            runner = TextTestRunner(self, verbosity=verbosity)

21530:78289625e986

class TestSuite(unittest.TestSuite):
    """Custom unitest TestSuite that knows how to execute Mercurial tests."""

    def __init__(self, runner, jobs=1, whitelist=None, blacklist=None,
                 retest=False,
                 *args, **kwargs):
        """Create a new instance that can run tests with a configuration.

        jobs specifies the number of jobs to run concurrently. Each test
        executes on its own thread. Tests actually spawn new processes, so

        blacklisted, respectively. These arguments don't belong in TestSuite.
        Instead, whitelist and blacklist should be handled by the thing that
        populates the TestSuite with tests. They are present to preserve
        backwards compatible behavior which reports skipped tests as part
        of the results.

        retest denotes whether to retest failed tests. This arguably belongs
        outside of TestSuite.
        """
        super(TestSuite, self).__init__(*args, **kwargs)

        self._runner = runner
        self._jobs = jobs
        self._whitelist = whitelist
        self._blacklist = blacklist
        self._retest = retest

    def run(self, result):
        options = self._runner.options

        # We have a number of filters that need to be applied. We do this

            if not (self._whitelist and test.name in self._whitelist):
                if self._blacklist and test.name in self._blacklist:
                    result.addSkip(test, 'blacklisted')
                    continue

                if self._retest and not os.path.exists(test.errpath):
                    result.addIgnore(test, 'not retesting')
                    continue

                if options.keywords:
                    f = open(test.path)

            warned = False

            suite = TestSuite(self, jobs=self.options.jobs,
                              whitelist=self.options.whitelisted,
                              blacklist=self.options.blacklist,
                              retest=self.options.retest,
                              tests=tests)
            verbosity = 1
            if self.options.verbose:
                verbosity = 2
            runner = TextTestRunner(self, verbosity=verbosity)