From dba223616d71ab9fb1ff70dd22cffe9ca05ef0dc Mon Sep 17 00:00:00 2001 From: Stefan Behnel Date: Tue, 16 Apr 2013 07:45:11 +0200 Subject: [PATCH] fix pyregr test runner --- runtests.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/runtests.py b/runtests.py index b6b78f5..c50ae9e 100755 --- a/runtests.py +++ b/runtests.py @@ -59,6 +59,11 @@ except ImportError: def __repr__(self): return repr(self._dict) +try: + basestring +except NameError: + basestring = str + WITH_CYTHON = True CY3_DIR = None @@ -807,11 +812,14 @@ class CythonRunTestCase(CythonCompileTestCase): pass def run_tests(self, result, ext_so_path): - self.run_doctests(result, ext_so_path) + self.run_doctests(self.module, result, ext_so_path) - def run_doctests(self, result, ext_so_path): + def run_doctests(self, module_or_name, result, ext_so_path): def run_test(result): - module = import_ext(self.module, ext_so_path) + if isinstance(module_or_name, basestring): + module = import_ext(module_or_name, ext_so_path) + else: + module = module_or_name tests = doctest.DocTestSuite(module) tests.run(result) run_forked_test(result, run_test, self.shortDescription(), self.fork) @@ -1003,7 +1011,7 @@ class CythonPyregrTestCase(CythonRunTestCase): suite.run(result) def _run_doctest(self, result, module): - self.run_doctests(module, result) + self.run_doctests(module, result, None) def run_tests(self, result, ext_so_path): try: -- 2.7.4