[GR-17454] numpy tests

PullRequest: graalpython/627

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/frame/FrameBuiltins.java

@@ -79,7 +79,7 @@ Object get(VirtualFrame curFrame, PFrame self) {
                     }
                     return getDictNode.execute(curFrame, globals, PNone.NO_VALUE);
                 } else {
-                    return globals != null ? globals : PNone.NONE;
+                    return globals != null ? globals : factory().createDict();
                 }
             }
             return factory().createDict();

graalpython/lib-graalpython/faulthandler.py

@@ -49,3 +49,8 @@ def disable():
 @__builtin__
 def is_enabled():
     return _enabled
+
+
+@__builtin__
+def cancel_dump_traceback_later():
+    pass

graalpython/lib-graalpython/modules/ginstall.py

@@ -63,7 +63,67 @@ def pytest(**kwargs):
         attrs(**kwargs)
         packaging(**kwargs)
         py(**kwargs)
-        install_from_pypi("pytest==5.0.1", **kwargs)
+        patch = """
+diff --git a/src/_pytest/_code/code.py b/src/_pytest/_code/code.py
+index aa4dcff..029e659 100644
+--- a/src/_pytest/_code/code.py
++++ b/src/_pytest/_code/code.py
+@@ -211,15 +211,17 @@ class TracebackEntry:
+             if key is not None:
+                 astnode = astcache.get(key, None)
+         start = self.getfirstlinesource()
+-        try:
+-            astnode, _, end = getstatementrange_ast(
+-                self.lineno, source, astnode=astnode
+-            )
+-        except SyntaxError:
+-            end = self.lineno + 1
+-        else:
+-            if key is not None:
+-                astcache[key] = astnode
++        end = -1
++        # GraalPython: no support for the ast module so the source cannot be retrieved correctly 
++        # try:
++        #     astnode, _, end = getstatementrange_ast(
++        #         self.lineno, source, astnode=astnode
++        #     )
++        # except SyntaxError:
++        #     end = self.lineno + 1
++        # else:
++        #     if key is not None:
++        #         astcache[key] = astnode
+         return source[start:end]
+ 
+     source = property(getsource)
+diff --git a/src/_pytest/python.py b/src/_pytest/python.py
+index 66d8530..8bb2ab6 100644
+--- a/src/_pytest/python.py
++++ b/src/_pytest/python.py
+@@ -494,8 +494,10 @@ class Module(nodes.File, PyCollector):
+     def _importtestmodule(self):
+         # we assume we are only called once per module
+         importmode = self.config.getoption("--import-mode")
++        imported = False
+         try:
+             mod = self.fspath.pyimport(ensuresyspath=importmode)
++            imported = True
+         except SyntaxError:
+             raise self.CollectError(
+                 _pytest._code.ExceptionInfo.from_current().getrepr(style="short")
+@@ -538,6 +540,10 @@ class Module(nodes.File, PyCollector):
+                 "or @pytest.mark.skipif decorators instead, and to skip a "
+                 "module use `pytestmark = pytest.mark.{skip,skipif}."
+             )
++        finally:
++            # this is needed for GraalPython: some modules fail with java level exceptions (the finally block still executes)
++            if not imported:
++                raise self.CollectError("Module could not be imported, the test could be unsupported by GraalPython")
+         self.config.pluginmanager.consider_module(mod)
+         return mod
+ 
+        
+        """
+        install_from_pypi("pytest==5.0.1", patch=patch, **kwargs)
 
     def py(**kwargs):
         install_from_pypi("py==1.8.0", **kwargs)