Py2/3 portability fixes in test runner

f81c75f4 · Stefan Behnel · 77bf40fa · f81c75f4
Commit f81c75f4 authored Jan 14, 2010 by Stefan Behnel
Hide whitespace changes
Inline Side-by-side

Showing with 27 additions and 21 deletions

runtests.py runtests.py +27 -21

No files found.
--- a/runtests.py
+++ b/runtests.py
@@ -408,26 +408,27 @@ class CythonRunTestCase(CythonCompileTestCase):
        if not child_id:
            result_code = 0
            try:
-                output = os.fdopen(result_handle, 'wb')
-                tests = None
                try:
-                    partial_result = PartialTestResult(result)
+                    output = os.fdopen(result_handle, 'wb')
-                    tests = doctest.DocTestSuite(module_name)
+                    tests = None
-                    tests.run(partial_result)
+                    try:
-                    gc.collect()
+                        partial_result = PartialTestResult(result)
-                except Exception:
+                        tests = doctest.DocTestSuite(module_name)
-                    if tests is None:
+                        tests.run(partial_result)
-                        # importing failed, try to fake a test class
+                        gc.collect()
-                        tests = _FakeClass(
+                    except Exception:
-                            failureException=None,
+                        if tests is None:
-                            shortDescription = self.shortDescription,
+                            # importing failed, try to fake a test class
-                            **{module_name: None})
+                            tests = _FakeClass(
-                    partial_result.addError(tests, sys.exc_info())
+                                failureException=None,
-                    result_code = 1
+                                shortDescription = self.shortDescription,
-                pickle.dump(partial_result.data(), output)
+                                **{module_name: None})
-            except:
+                        partial_result.addError(tests, sys.exc_info())
-                import traceback
+                        result_code = 1
-                traceback.print_exc()
+                    pickle.dump(partial_result.data(), output)
+                except:
+                    import traceback
+                    traceback.print_exc()
            finally:
                try: output.close()
                except: pass
@@ -741,8 +742,13 @@ if __name__ == '__main__':
                             ''')
            sys.path.insert(0, cy3_dir)
    elif sys.version_info[0] >= 3:
-        # make sure we do not import (or run) Cython itself
+        # make sure we do not import (or run) Cython itself (unless
-        options.with_cython = False
+        # 2to3 was already run)
+        cy3_dir = os.path.join(WORKDIR, 'Cy3')
+        if os.path.isdir(cy3_dir):
+            sys.path.insert(0, cy3_dir)
+        else:
+            options.with_cython = False
        options.doctests    = False
        options.unittests   = False
        options.pyregr      = False