comparison tests/run-tests.py @ 21506:bfe2616a2b0e

run-tests: no longer pass a TestRunner into Test.__init__

We no longer access any attributes on TestRunner besides options, so we
stop passing a TestRunner to Test.__init__ and now pass the options
data structure instead.

Subsequent patches will move accessed options attributes into named
arguments.

21505:3a1881dbf860

    """

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

    def __init__(self, runner, path, count, tmpdir, abort):
        """Create a test from parameters.

        runner is a TestRunner instance.

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

        count is an identifier used to denote this test instance.

        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._runner = runner
        self._options = runner.options
        self._count = count
        self._threadtmp = tmpdir
        self._abort = abort
        self._daemonpids = []

        self._skipped = None
        self._testtmp = None

        # If we're not in --debug mode and reference output file exists,
        # check test output against it.
        if runner.options.debug:
            self._refout = None # to match "out is None"
        elif os.path.exists(self._refpath):
            f = open(self._refpath, 'r')
            self._refout = f.read().splitlines(True)
            f.close()

                break

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

        return testcls(self, refpath, count, tmpdir, self.abort)

    def _cleanup(self):
        """Clean up state from this test invocation."""

        if self.options.keep_tmpdir:

21506:bfe2616a2b0e

    """

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

    def __init__(self, options, path, count, tmpdir, abort):
        """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.

        count is an identifier used to denote this test instance.

        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._count = count
        self._threadtmp = tmpdir
        self._abort = abort
        self._daemonpids = []

        self._skipped = None
        self._testtmp = None

        # If we're not in --debug mode and reference output file exists,
        # check test output against it.
        if options.debug:
            self._refout = None # to match "out is None"
        elif os.path.exists(self._refpath):
            f = open(self._refpath, 'r')
            self._refout = f.read().splitlines(True)
            f.close()

                break

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

        return testcls(self.options, refpath, count, tmpdir, self.abort)

    def _cleanup(self):
        """Clean up state from this test invocation."""

        if self.options.keep_tmpdir: