comparison tests/run-tests.py @ 21308:935ade207253

run-tests: capture reference output in TestResult class

21307:cd4fd7b3c3c4

        self._testtmp = os.path.join(self.threadtmp, os.path.basename(path))
        os.mkdir(self._testtmp)

        self._setreplacements(count)

    def run(self, result):
        env = self._getenv()
        createhgrc(env['HGRCPATH'], self._options)

        starttime = time.time()

        except Exception, e:
            updateduration()
            result.exception = e

        killdaemons(env['DAEMON_PIDS'])

    def _run(self, replacements, env):
        raise NotImplemented('Subclasses must implement Test.run()')

    def _setreplacements(self, count):

        self.ret = None
        self.out = None
        self.duration = None
        self.interrupted = False
        self.exception = None

    @property
    def skipped(self):
        """Whether the test was skipped."""
        return self.ret == SKIPPED_STATUS

    if os.path.exists(err):
        os.remove(err)       # Remove any previous output files

    t = runner(testpath, options, count)
    res = TestResult()
    t.run(res)

    if res.interrupted:
        log('INTERRUPTED: %s (after %d seconds)' % (test, res.duration))
        raise KeyboardInterrupt()

    times.append((test, res.duration))
    vlog("# Ret was:", ret)

    skipped = res.skipped

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

    if (ret != 0 or out != refout) and not skipped and not options.debug:
        # Save errors to a file for diagnosis
        f = open(err, "wb")
        for line in out:

21308:935ade207253

        self._testtmp = os.path.join(self.threadtmp, os.path.basename(path))
        os.mkdir(self._testtmp)

        self._setreplacements(count)

    def run(self, result, refpath):
        env = self._getenv()
        createhgrc(env['HGRCPATH'], self._options)

        starttime = time.time()

        except Exception, e:
            updateduration()
            result.exception = e

        killdaemons(env['DAEMON_PIDS'])

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

    def _run(self, replacements, env):
        raise NotImplemented('Subclasses must implement Test.run()')

    def _setreplacements(self, count):

        self.ret = None
        self.out = None
        self.duration = None
        self.interrupted = False
        self.exception = None
        self.refout = None

    @property
    def skipped(self):
        """Whether the test was skipped."""
        return self.ret == SKIPPED_STATUS

    if os.path.exists(err):
        os.remove(err)       # Remove any previous output files

    t = runner(testpath, options, count)
    res = TestResult()
    t.run(res, ref)

    if res.interrupted:
        log('INTERRUPTED: %s (after %d seconds)' % (test, res.duration))
        raise KeyboardInterrupt()

    times.append((test, res.duration))
    vlog("# Ret was:", ret)

    skipped = res.skipped
    refout = res.refout

    if (ret != 0 or out != refout) and not skipped and not options.debug:
        # Save errors to a file for diagnosis
        f = open(err, "wb")
        for line in out: