comparison tests/run-tests.py @ 21509:d21d53ee0d7a

run-tests: factor options.keep_tmpdir into an argument to Test.__init__

21508:4cc3aaa3a2ee

    """

    # 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.

        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.
        It is consulted periodically during the execution of tests.
        """

        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._daemonpids = []

        self._finished = None
        self._ret = None
        self._out = None

        """Tasks to perform after run()."""
        for entry in self._daemonpids:
            killdaemons(entry)
        self._daemonpids = []

        if not self._options.keep_tmpdir:
            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:

                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:

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.

        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.
        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

        """Tasks to perform after run()."""
        for entry in self._daemonpids:
            killdaemons(entry)
        self._daemonpids = []

        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:

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

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

        if self.options.keep_tmpdir: