[GR-10672] Immediately print exceptions during unit test setup.

PullRequest: graalpython/100

Author: fangerer

graalpython/com.oracle.graal.python.test/src/graalpytest.py

@@ -39,12 +39,10 @@
 import _io
 import sys
 
-
 os = sys.modules.get("posix", sys.modules.get("nt", None))
 if os is None:
     raise ImportError("posix or nt module is required in builtin modules")
 
-
 FAIL = '\033[91m'
 ENDC = '\033[0m'
 BOLD = '\033[1m'
@@ -57,12 +55,13 @@ class SkipTest(BaseException):
 
 
 class TestCase(object):
+
     def __init__(self):
         self.exceptions = []
         self.passed = 0
         self.failed = 0
 
-    def run_safely(self, func):
+    def run_safely(self, func, print_immediately=False):
         if verbose:
             print(u"\n\t\u21B3 ", func.__name__, " ", end="")
         try:
@@ -71,6 +70,8 @@ def run_safely(self, func):
             if isinstance(e, SkipTest):
                 print("Skipped: %s" % e)
             else:
+                if print_immediately:
+                    print("Exception during setup occurred: %s\n" % e)
                 code = func.__code__
                 self.exceptions.append(
                     ("%s:%d (%s)" % (code.co_filename, code.co_firstlineno, func), e)
@@ -95,7 +96,7 @@ def success(self):
 
     def failure(self):
         self.failed += 1
-        fail_msg = FAIL+BOLD+"F"+ENDC if verbose else "F"
+        fail_msg = FAIL + BOLD + "F" + ENDC if verbose else "F"
         print(fail_msg, end="", flush=True)
 
     def assertTrue(self, value, msg=""):
@@ -141,6 +142,7 @@ def assertSequenceEqual(self, expected, actual, msg=None):
             assert expected_value == next(actual_iter), msg
 
     class assertRaises():
+
         def __init__(self, exc_type, function=None, *args, **kwargs):
             if function is None:
                 self.exc_type = exc_type
@@ -177,9 +179,9 @@ def run(cls, items=None):
                     break
                 items += typ.__dict__.items()
         if hasattr(instance, "setUp"):
-            if not instance.run_safely(instance.setUp):
+            if not instance.run_safely(instance.setUp, print_immediately=True):
                 return instance
-        for k,v in items:
+        for k, v in items:
             if k.startswith("test"):
                 if patterns:
                     if not any(p in k for p in patterns):
@@ -198,6 +200,7 @@ class ThisTestCase(cls, TestCase): pass
 
 
 class TestRunner(object):
+
     def __init__(self, paths):
         self.testfiles = TestRunner.find_testfiles(paths)
         self.exceptions = []
@@ -255,7 +258,7 @@ def run(self):
                 print(u"\n\u25B9 ", module.__name__, end="")
             # some tests can modify the global scope leading to a RuntimeError: test_scope.test_nesting_plus_free_ref_to_global
             module_dict = dict(module.__dict__)
-            for k,v in module_dict.items():
+            for k, v in module_dict.items():
                 if (k.startswith("Test") or k.endswith("Test") or k.endswith("Tests")) and isinstance(v, type):
                     testcase = TestCase.runClass(v)
                 else:

graalpython/com.oracle.graal.python.test/src/tests/cpyext/__init__.py

@@ -70,6 +70,14 @@ def setUp(self):
 def ccompile(self, name):
     from distutils.core import setup, Extension
     source_file = '%s/%s.c' % (__dir__, name)
+
+    try:
+        stat_result = os.stat(source_file)
+        if stat_result[6] == 0:
+            raise SystemError("empty source file %s" % (source_file,))
+    except FileNotFoundError:
+        raise SystemError("source file %s not available" % (source_file,))
+
     module = Extension(name, sources=[source_file])
     args = ['--quiet', 'build', 'install_lib', '-f', '--install-dir=%s' % __dir__]
     setup(
@@ -81,12 +89,25 @@ def ccompile(self, name):
         ext_modules=[module]
     )
     # ensure file was really written
+    binary_file_llvm = '%s/%s.bc' % (__dir__, name)
+    binary_file_gcc = '%s/%s.so' % (__dir__, name)
+
+    tries = 0
+    while tries < 3 and not file_not_empty(binary_file_llvm) and not file_not_empty(binary_file_gcc):
+        tries += 1
+
+    if tries >= 3:
+        raise SystemError("binary file %s/%s.(bc|so) not available" % (__dir__, name))
+
+
+def file_not_empty(path):
     try:
-        stat_result = os.stat(source_file)
+        stat_result = os.stat(path)
         if stat_result[6] == 0:
-            raise SystemError("empty source file %s" % (source_file,))
+            return False
     except FileNotFoundError:
-        raise SystemError("source file %s not available" % (source_file,))
+        return False
+    return True
 
 
 c_template = """
@@ -502,11 +523,21 @@ def CPyExtType(name, code, **kwargs):
     kwargs.setdefault("ready_code", "")
     c_source = UnseenFormatter().format(template, **kwargs)
 
-    with open("%s/%s.c" % (__dir__, name), "wb", buffering=0) as f:
+    source_file = "%s/%s.c" % (__dir__, name)
+    with open(source_file, "wb", buffering=0) as f:
         if GRAALPYTHON:
             f.write(c_source)
         else:
             f.write(bytes(c_source, 'utf-8'))
+
+    # ensure file was really written
+    try:
+        stat_result = os.stat(source_file)
+        if stat_result[6] == 0:
+            raise SystemError("empty source file %s" % (source_file,))
+    except FileNotFoundError:
+        raise SystemError("source file %s not available" % (source_file,))
+
     ccompile(None, name)
     sys.path.insert(0, __dir__)
     try:

mx.graalpython/mx_graalpython.py

@@ -342,7 +342,7 @@ def graalpython_gate_runner(args, tasks):
     with Task('GraalPython Python tests', tasks, tags=[GraalPythonTags.unittest]) as task:
         if task:
             test_args = [_graalpytest_driver, "-v", _test_project + "src/tests/"]
-            mx.command_function("python")(test_args)
+            mx.command_function("python")(["--python.CatchAllExceptions=true"] + test_args)
             if platform.system() != 'Darwin':
                 # TODO: re-enable when python3 is available on darwin
                 mx.log("Running tests with CPython")