comparison tests/run-tests.py @ 21490:588ebd47cd87

run-tests: replace Test.skip() with raise SkipTest

All the result functions now raise an Exception. We no longer need these
functions and we can inline the raise.

21489:f245c1fc7e96

        """Run this test instance.

        This will return a tuple describing the result of the test.
        """
        if not os.path.exists(self._path):
            return self.skip("Doesn't exist")

        options = self._options
        if not (options.whitelisted and self.name in options.whitelisted):
            if options.blacklist and self.name in options.blacklist:
                return self.skip('blacklisted')

            if options.retest and not os.path.exists('%s.err' % self.name):
                return self.ignore('not retesting')

            if options.keywords:

                        break
                    else:
                        return self.ignore("doesn't match keyword")

        if not os.path.basename(self.name.lower()).startswith('test-'):
            return self.skip('not a test file')

        replacements, port = self._getreplacements()
        env = self._getenv(port)
        self._daemonpids.append(env['DAEMON_PIDS'])
        self._createhgrc(env['HGRCPATH'])

            if failed:
                self._result = self.fail('hg have failed checking for %s' %
                                         failed[-1], ret)
            else:
                self._skipped = True
                self._result = self.skip(missing[-1])
        elif ret == 'timeout':
            self._result = self.fail('timed out', ret)
        elif out != self._refout:
            info = {}
            if not options.nodiff:

        self._runner.times.append((self.name, self._duration))

    def _run(self, replacements, env):
        # This should be implemented in child classes to run tests.
        return self._skip('unknown test type')

    def _getreplacements(self):
        port = self._options.port + self._count * 3
        r = [
            (r':%s\b' % port, ':$HGPORT'),

            raise WarnTest(msg)
        else:
            # unittest differentiates between errored and failed.
            # Failed is denoted by AssertionError (by default at least).
            raise AssertionError(msg)

    def skip(self, msg):
        raise SkipTest(msg)

    def ignore(self, msg):
        raise IgnoreTest(msg)

class PythonTest(Test):

21490:588ebd47cd87

        """Run this test instance.

        This will return a tuple describing the result of the test.
        """
        if not os.path.exists(self._path):
            raise SkipTest("Doesn't exist")

        options = self._options
        if not (options.whitelisted and self.name in options.whitelisted):
            if options.blacklist and self.name in options.blacklist:
                raise SkipTest('blacklisted')

            if options.retest and not os.path.exists('%s.err' % self.name):
                return self.ignore('not retesting')

            if options.keywords:

                        break
                    else:
                        return self.ignore("doesn't match keyword")

        if not os.path.basename(self.name.lower()).startswith('test-'):
            raise SkipTest('not a test file')

        replacements, port = self._getreplacements()
        env = self._getenv(port)
        self._daemonpids.append(env['DAEMON_PIDS'])
        self._createhgrc(env['HGRCPATH'])

            if failed:
                self._result = self.fail('hg have failed checking for %s' %
                                         failed[-1], ret)
            else:
                self._skipped = True
                raise SkipTest(missing[-1])
        elif ret == 'timeout':
            self._result = self.fail('timed out', ret)
        elif out != self._refout:
            info = {}
            if not options.nodiff:

        self._runner.times.append((self.name, self._duration))

    def _run(self, replacements, env):
        # This should be implemented in child classes to run tests.
        raise SkipTest('unknown test type')

    def _getreplacements(self):
        port = self._options.port + self._count * 3
        r = [
            (r':%s\b' % port, ':$HGPORT'),

            raise WarnTest(msg)
        else:
            # unittest differentiates between errored and failed.
            # Failed is denoted by AssertionError (by default at least).
            raise AssertionError(msg)

    def ignore(self, msg):
        raise IgnoreTest(msg)

class PythonTest(Test):