comparison tests/run-tests.py @ 21531:7fcda22acc43

run-tests: make keywords a named argument to TestSuite.__init__

This was the last usage of option in ``TextTestRunner.run``.

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

        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
        # here instead of inside Test because it makes the running logic for
        # Test simpler.
        tests = []
        for test in self._tests:

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

                if options.keywords:
                    f = open(test.path)
                    t = f.read().lower() + test.name.lower()
                    f.close()
                    ignored = False
                    for k in options.keywords.lower().split():
                        if k not in t:
                            result.addIgnore(test, "doesn't match keyword")
                            ignored = True
                            break

            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)

21531:7fcda22acc43

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, keywords=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

        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.

        keywords denotes key words that will be used to filter which tests
        to execute. 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
        self._keywords = keywords

    def run(self, result):
        # We have a number of filters that need to be applied. We do this
        # here instead of inside Test because it makes the running logic for
        # Test simpler.
        tests = []
        for test in self._tests:

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

                if self._keywords:
                    f = open(test.path)
                    t = f.read().lower() + test.name.lower()
                    f.close()
                    ignored = False
                    for k in self._keywords.lower().split():
                        if k not in t:
                            result.addIgnore(test, "doesn't match keyword")
                            ignored = True
                            break

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