##// END OF EJS Templates
run-tests: roll pytest() into PythonTest._run()...
Gregory Szorc -
r21311:f9a7018a default
parent child Browse files
Show More
@@ -675,19 +675,16 b' class TestResult(object):'
675 675 """Whether the test was skipped."""
676 676 return self.ret == SKIPPED_STATUS
677 677
678 def pytest(test, wd, options, replacements, env):
679 py3kswitch = options.py3k_warnings and ' -3' or ''
680 cmd = '%s%s "%s"' % (PYTHON, py3kswitch, test)
681 vlog("# Running", cmd)
682 if os.name == 'nt':
683 replacements.append((r'\r\n', '\n'))
684 return run(cmd, wd, options, replacements, env)
685
686 678 class PythonTest(Test):
687 679 """A Python-based test."""
688 680 def _run(self, testtmp, replacements, env):
689 return pytest(self._path, testtmp, self._options, replacements,
690 env)
681 py3kswitch = self._options.py3k_warnings and ' -3' or ''
682 cmd = '%s%s "%s"' % (PYTHON, py3kswitch, self._path)
683 vlog("# Running", cmd)
684 if os.name == 'nt':
685 replacements.append((r'\r\n', '\n'))
686 return run(cmd, testtmp, self._options, replacements, env)
687
691 688
692 689 needescape = re.compile(r'[\x00-\x08\x0b-\x1f\x7f-\xff]').search
693 690 escapesub = re.compile(r'[\x00-\x08\x0b-\x1f\\\x7f-\xff]').sub
General Comments 0
You need to be logged in to leave comments. Login now