comparison tests/run-tests.py @ 21518:8e8049b9bda4

run-tests: remove options from Test.__init__

All options are now passed as arguments and we no longer need options.

This enables us to instantiate Test from "plain old data" types. Since
options must be given as arguments, it also makes people think harder
about adding things that may not belong in Test. This will help ensure a
proper separation of responsibility going forward.

21517:af7d3a5c330b

    """

    # Status code reserved for skipped tests (used by hghave).
    SKIPPED_STATUS = 80

    def __init__(self, options, path, tmpdir, abort, keeptmpdir=False,
                 debug=False, nodiff=False, diffviewer=None,
                 interactive=False, timeout=defaults['timeout'],
                 startport=defaults['port'], extraconfigopts=None,
                 py3kwarnings=False, shell=None):
        """Create a test from parameters.

        options are parsed command line options that control test execution.

        path is the full path to the file defining the test.

        tmpdir is the main temporary directory to use for this test.

        abort is a flag that turns to True if test execution should be aborted.

        self.path = path
        self.name = os.path.basename(path)
        self._testdir = os.path.dirname(path)
        self.errpath = os.path.join(self._testdir, '%s.err' % self.name)

        self._options = options
        self._threadtmp = tmpdir
        self._abort = abort
        self._keeptmpdir = keeptmpdir
        self._debug = debug
        self._nodiff = nodiff

                break

        refpath = os.path.join(self.testdir, test)
        tmpdir = os.path.join(self.hgtmp, 'child%d' % count)

        return testcls(self.options, refpath, tmpdir, self.abort,
                       keeptmpdir=self.options.keep_tmpdir,
                       debug=self.options.debug,
                       nodiff = self.options.nodiff,
                       diffviewer=self.options.view,
                       interactive=self.options.interactive,

21518:8e8049b9bda4

    """

    # Status code reserved for skipped tests (used by hghave).
    SKIPPED_STATUS = 80

    def __init__(self, path, tmpdir, abort, keeptmpdir=False,
                 debug=False, nodiff=False, diffviewer=None,
                 interactive=False, timeout=defaults['timeout'],
                 startport=defaults['port'], extraconfigopts=None,
                 py3kwarnings=False, shell=None):
        """Create a test from parameters.

        path is the full path to the file defining the test.

        tmpdir is the main temporary directory to use for this test.

        abort is a flag that turns to True if test execution should be aborted.

        self.path = path
        self.name = os.path.basename(path)
        self._testdir = os.path.dirname(path)
        self.errpath = os.path.join(self._testdir, '%s.err' % self.name)

        self._threadtmp = tmpdir
        self._abort = abort
        self._keeptmpdir = keeptmpdir
        self._debug = debug
        self._nodiff = nodiff

                break

        refpath = os.path.join(self.testdir, test)
        tmpdir = os.path.join(self.hgtmp, 'child%d' % count)

        return testcls(refpath, tmpdir, self.abort,
                       keeptmpdir=self.options.keep_tmpdir,
                       debug=self.options.debug,
                       nodiff = self.options.nodiff,
                       diffviewer=self.options.view,
                       interactive=self.options.interactive,