comparison tests/run-tests.py @ 21529:117e027390ab

run-tests: move whitelist and blacklist to named arguments of TestSuite

21528:32b9bbca2052

                test.name, self.times[-1][1]))

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

    def __init__(self, runner, jobs=1, *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
        state mutation should not be an issue.
        """
        super(TestSuite, self).__init__(*args, **kwargs)

        self._runner = runner
        self._jobs = jobs

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

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

        for test in self._tests:
            if not os.path.exists(test.path):
                result.addSkip(test, "Doesn't exist")
                continue

            if not (options.whitelisted and test.name in options.whitelisted):
                if options.blacklist and test.name in options.blacklist:
                    result.addSkip(test, 'blacklisted')
                    continue

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

            tests = [self._gettest(t, i) for i, t in enumerate(tests)]

            failed = False
            warned = False

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

21529:117e027390ab

                test.name, self.times[-1][1]))

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
        state mutation should not be an issue.

        whitelist and blacklist denote tests that have been whitelisted and
        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

        for test in self._tests:
            if not os.path.exists(test.path):
                result.addSkip(test, "Doesn't exist")
                continue

            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')

            tests = [self._gettest(t, i) for i, t in enumerate(tests)]

            failed = False
            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)
            runner.run(suite)