comparison tests/run-tests.py @ 21311:f9a7018a35ff

run-tests: roll pytest() into PythonTest._run()

Python was the old runner function. It no longer needs to exist since
the PythonTest class took its job.

21310:af9a04951c69

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

def pytest(test, wd, options, replacements, env):
    py3kswitch = options.py3k_warnings and ' -3' or ''
    cmd = '%s%s "%s"' % (PYTHON, py3kswitch, test)
    vlog("# Running", cmd)
    if os.name == 'nt':
        replacements.append((r'\r\n', '\n'))
    return run(cmd, wd, options, replacements, env)

class PythonTest(Test):
    """A Python-based test."""
    def _run(self, testtmp, replacements, env):
        return pytest(self._path, testtmp, self._options, replacements,
                      env)

needescape = re.compile(r'[\x00-\x08\x0b-\x1f\x7f-\xff]').search
escapesub = re.compile(r'[\x00-\x08\x0b-\x1f\\\x7f-\xff]').sub
escapemap = dict((chr(i), r'\x%02x' % i) for i in range(256))
escapemap.update({'\\': '\\\\', '\r': r'\r'})

21311:f9a7018a35ff

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

class PythonTest(Test):
    """A Python-based test."""
    def _run(self, testtmp, replacements, env):
        py3kswitch = self._options.py3k_warnings and ' -3' or ''
        cmd = '%s%s "%s"' % (PYTHON, py3kswitch, self._path)
        vlog("# Running", cmd)
        if os.name == 'nt':
            replacements.append((r'\r\n', '\n'))
        return run(cmd, testtmp, self._options, replacements, env)


needescape = re.compile(r'[\x00-\x08\x0b-\x1f\x7f-\xff]').search
escapesub = re.compile(r'[\x00-\x08\x0b-\x1f\\\x7f-\xff]').sub
escapemap = dict((chr(i), r'\x%02x' % i) for i in range(256))
escapemap.update({'\\': '\\\\', '\r': r'\r'})