comparison tests/run-tests.py @ 21510:97127c4ce460

run-tests: move debug into an argument to Test.__init__

21509:d21d53ee0d7a

    """

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

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

        abort is a flag that turns to True if test execution should be aborted.
        It is consulted periodically during the execution of tests.

        keeptmpdir determines whether to keep the test's temporary directory
        after execution. It defaults to removal (False).
        """

        self.path = path
        self.name = os.path.basename(path)
        self._testdir = os.path.dirname(path)

        self._options = options
        self._count = count
        self._threadtmp = tmpdir
        self._abort = abort
        self._keeptmpdir = keeptmpdir
        self._daemonpids = []

        self._finished = None
        self._ret = None
        self._out = None
        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()

        if not self._keeptmpdir:
            shutil.rmtree(self._testtmp, True)
            shutil.rmtree(self._threadtmp, True)

        if (self._ret != 0 or self._out != self._refout) and not self._skipped \
            and not self._options.debug and self._out:
            f = open(self.errpath, 'wb')
            for line in self._out:
                f.write(line)
            f.close()

        cmd = '%s%s "%s"' % (PYTHON, py3kswitch, self.path)
        vlog("# Running", cmd)
        if os.name == 'nt':
            replacements.append((r'\r\n', '\n'))
        return run(cmd, self._testtmp, replacements, env, self._abort,
                   debug=self._options.debug, timeout=self._options.timeout)

class TTest(Test):
    """A "t test" is a test backed by a .t file."""

    SKIPPED_PREFIX = 'skipped: '

        cmd = '%s "%s"' % (self._options.shell, fname)
        vlog("# Running", cmd)

        exitcode, output = run(cmd, self._testtmp, replacements, env,
                               self._abort, debug=self._options.debug,
                               timeout=self._options.timeout)
        # Do not merge output if skipped. Return hghave message instead.
        # Similarly, with --debug, output is None.
        if exitcode == self.SKIPPED_STATUS or output is None:
            return exitcode, output

        # We keep track of whether or not we're in a Python block so we
        # can generate the surrounding doctest magic.
        inpython = False

        if self._options.debug:
            script.append('set -x\n')
        if os.getenv('MSYSTEM'):
            script.append('alias pwd="pwd -W"\n')

        for n, l in enumerate(lines):

        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,
                       keeptmpdir=self.options.keep_tmpdir)

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

        if self.options.keep_tmpdir:

21510:97127c4ce460

    """

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

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

        abort is a flag that turns to True if test execution should be aborted.
        It is consulted periodically during the execution of tests.

        keeptmpdir determines whether to keep the test's temporary directory
        after execution. It defaults to removal (False).

        debug mode will make the test execute verbosely, with unfiltered
        output.
        """

        self.path = path
        self.name = os.path.basename(path)
        self._testdir = os.path.dirname(path)

        self._options = options
        self._count = count
        self._threadtmp = tmpdir
        self._abort = abort
        self._keeptmpdir = keeptmpdir
        self._debug = debug
        self._daemonpids = []

        self._finished = None
        self._ret = None
        self._out = None
        self._skipped = None
        self._testtmp = None

        # If we're not in --debug mode and reference output file exists,
        # check test output against it.
        if 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()

        if not self._keeptmpdir:
            shutil.rmtree(self._testtmp, True)
            shutil.rmtree(self._threadtmp, True)

        if (self._ret != 0 or self._out != self._refout) and not self._skipped \
            and not self._debug and self._out:
            f = open(self.errpath, 'wb')
            for line in self._out:
                f.write(line)
            f.close()

        cmd = '%s%s "%s"' % (PYTHON, py3kswitch, self.path)
        vlog("# Running", cmd)
        if os.name == 'nt':
            replacements.append((r'\r\n', '\n'))
        return run(cmd, self._testtmp, replacements, env, self._abort,
                   debug=self._debug, timeout=self._options.timeout)

class TTest(Test):
    """A "t test" is a test backed by a .t file."""

    SKIPPED_PREFIX = 'skipped: '

        cmd = '%s "%s"' % (self._options.shell, fname)
        vlog("# Running", cmd)

        exitcode, output = run(cmd, self._testtmp, replacements, env,
                               self._abort, debug=self._debug,
                               timeout=self._options.timeout)
        # Do not merge output if skipped. Return hghave message instead.
        # Similarly, with --debug, output is None.
        if exitcode == self.SKIPPED_STATUS or output is None:
            return exitcode, output

        # We keep track of whether or not we're in a Python block so we
        # can generate the surrounding doctest magic.
        inpython = False

        if self._debug:
            script.append('set -x\n')
        if os.getenv('MSYSTEM'):
            script.append('alias pwd="pwd -W"\n')

        for n, l in enumerate(lines):

        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,
                       keeptmpdir=self.options.keep_tmpdir,
                       debug=self.options.debug)

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

        if self.options.keep_tmpdir: