[GR-17454][GR-17525] import/run pytest

PullRequest: graalpython/601

Author: cosminbasca

graalpython/com.oracle.graal.python.test/src/tests/test_subprocess.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, Oracle and/or its affiliates.
+# Copyright (c) 2018, 2019, Oracle and/or its affiliates.
 # Copyright (C) 1996-2017 Python Software Foundation
 #
 # Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
@@ -79,3 +79,16 @@ def test_check_output_stdout_arg(self):
                     stdout=sys.stdout)
             self.fail("Expected ValueError when stdout arg supplied.")
         self.assertIn('stdout', c.exception.args[0])
+
+    def test_kill(self):
+        p = subprocess.Popen([sys.executable, "-c", "print('oh no')"])
+        p.kill()
+        assert True
+
+    def test_waitpid(self):
+        import os
+        p = subprocess.Popen([sys.executable, "-c", "import time; time.sleep(2); 42"])
+        try:
+            assert os.waitpid(p.pid, os.WNOHANG) == (0, 0)
+        finally:
+            p.kill()

graalpython/com.oracle.graal.python.test/src/tests/test_tempfile.py

@@ -0,0 +1,59 @@
+# Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# The Universal Permissive License (UPL), Version 1.0
+#
+# Subject to the condition set forth below, permission is hereby granted to any
+# person obtaining a copy of this software, associated documentation and/or
+# data (collectively the "Software"), free of charge and under any and all
+# copyright rights in the Software, and any and all patent rights owned or
+# freely licensable by each licensor hereunder covering either (i) the
+# unmodified Software as contributed to or provided by such licensor, or (ii)
+# the Larger Works (as defined below), to deal in both
+#
+# (a) the Software, and
+#
+# (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+# one is included with the Software each a "Larger Work" to which the Software
+# is contributed by such licensors),
+#
+# without restriction, including without limitation the rights to copy, create
+# derivative works of, display, perform, and distribute the Software and make,
+# use, sell, offer for sale, import, export, have made, and have sold the
+# Software and the Larger Work(s), and to sublicense the foregoing rights on
+# either these or other terms.
+#
+# This license is subject to the following condition:
+#
+# The above copyright notice and either this complete permission notice or at a
+# minimum a reference to the UPL must be included in all copies or substantial
+# portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+
+def assert_raises(err, fn, *args, **kwargs):
+    raised = False
+    try:
+        fn(*args, **kwargs)
+    except err:
+        raised = True
+    assert raised
+
+
+def test_create():
+    from tempfile import TemporaryFile
+    try:
+        f = TemporaryFile()
+        assert f is not None
+        f.close()
+    except Exception as e:
+        print(e)
+        assert False
+

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java

@@ -380,8 +380,8 @@ protected Iterable<Scope> findTopScopes(PythonContext context) {
         ArrayList<Scope> scopes = new ArrayList<>();
         if (context.getBuiltins() != null) {
             // false during initialization
-            scopes.add(Scope.newBuilder("__main__", context.getMainModule()).build());
-            scopes.add(Scope.newBuilder("builtins", scopeFromObject(context.getBuiltins())).build());
+            scopes.add(Scope.newBuilder(BuiltinNames.__MAIN__, context.getMainModule()).build());
+            scopes.add(Scope.newBuilder(BuiltinNames.BUILTINS, scopeFromObject(context.getBuiltins())).build());
         }
         return scopes;
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/Python3Core.java

@@ -40,9 +40,6 @@
 import java.util.function.Supplier;
 import java.util.logging.Level;
 
-import com.oracle.graal.python.builtins.modules.ResourceModuleBuiltins;
-import org.graalvm.nativeimage.ImageInfo;
-
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.modules.ArrayModuleBuiltins;
 import com.oracle.graal.python.builtins.modules.AstModuleBuiltins;
@@ -78,6 +75,7 @@
 import com.oracle.graal.python.builtins.modules.QueueModuleBuiltins;
 import com.oracle.graal.python.builtins.modules.RandomModuleBuiltins;
 import com.oracle.graal.python.builtins.modules.ReadlineModuleBuiltins;
+import com.oracle.graal.python.builtins.modules.ResourceModuleBuiltins;
 import com.oracle.graal.python.builtins.modules.SREModuleBuiltins;
 import com.oracle.graal.python.builtins.modules.SelectModuleBuiltins;
 import com.oracle.graal.python.builtins.modules.SignalModuleBuiltins;
@@ -163,15 +161,16 @@
 import com.oracle.graal.python.builtins.objects.type.TypeBuiltins;
 import com.oracle.graal.python.builtins.objects.type.TypeNodes.GetNameNode;
 import com.oracle.graal.python.builtins.objects.zipimporter.ZipImporterBuiltins;
+import com.oracle.graal.python.nodes.BuiltinNames;
 import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.runtime.PythonCore;
 import com.oracle.graal.python.runtime.PythonParser;
 import com.oracle.graal.python.runtime.PythonParser.ParserMode;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
+import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.CallTarget;
 import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.TruffleFile;
@@ -182,6 +181,8 @@
 import com.oracle.truffle.api.source.Source;
 import com.oracle.truffle.api.source.SourceSection;
 
+import org.graalvm.nativeimage.ImageInfo;
+
 /**
  * The core is intended to the immutable part of the interpreter, including most modules and most
  * types.
@@ -213,6 +214,7 @@ private static final String[] initializeCoreFiles() {
                         "_weakref",
                         "set",
                         "itertools",
+                        "faulthandler",
                         "base_exception",
                         PythonCextBuiltins.PYTHON_CEXT,
                         "_collections",
@@ -428,11 +430,11 @@ private void initializeJavaCore() {
         initializeTypes();
         populateBuiltins();
         publishBuiltinModules();
-        builtinsModule = builtinModules.get("builtins");
+        builtinsModule = builtinModules.get(BuiltinNames.BUILTINS);
     }
 
     private void initializePythonCore(String coreHome) {
-        loadFile("builtins", coreHome);
+        loadFile(BuiltinNames.BUILTINS, coreHome);
         for (String s : coreFiles) {
             loadFile(s, coreHome);
         }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/PythonBuiltinClassType.java

@@ -48,64 +48,64 @@
 public enum PythonBuiltinClassType implements LazyPythonClass {
 
     ForeignObject(BuiltinNames.FOREIGN),
-    Boolean("bool", "builtins"),
+    Boolean("bool", BuiltinNames.BUILTINS),
     GetSetDescriptor("get_set_desc"),
     PArray("array", "array"),
     PArrayIterator("arrayiterator"),
     PIterator("iterator"),
     PBuiltinFunction("method_descriptor"),
     PBuiltinMethod("builtin_function_or_method"),
-    PByteArray("bytearray", "builtins"),
-    PBytes("bytes", "builtins"),
+    PByteArray("bytearray", BuiltinNames.BUILTINS),
+    PBytes("bytes", BuiltinNames.BUILTINS),
     PCell("cell"),
-    PComplex("complex", "builtins"),
-    PDict("dict", "builtins"),
+    PComplex("complex", BuiltinNames.BUILTINS),
+    PDict("dict", BuiltinNames.BUILTINS),
     PDictKeysView("dict_keys"),
     PDictItemsIterator("dict_itemsiterator"),
     PDictItemsView("dict_items"),
     PDictKeysIterator("dict_keysiterator"),
     PDictValuesIterator("dict_valuesiterator"),
     PDictValuesView("dict_values"),
     PEllipsis("ellipsis"),
-    PEnumerate("enumerate", "builtins"),
-    PFloat("float", "builtins"),
+    PEnumerate("enumerate", BuiltinNames.BUILTINS),
+    PFloat("float", BuiltinNames.BUILTINS),
     PFrame("frame"),
-    PFrozenSet("frozenset", "builtins"),
+    PFrozenSet("frozenset", BuiltinNames.BUILTINS),
     PFunction("function"),
     PGenerator("generator"),
-    PInt("int", "builtins"),
-    PList("list", "builtins"),
+    PInt("int", BuiltinNames.BUILTINS),
+    PList("list", BuiltinNames.BUILTINS),
     PMappingproxy("mappingproxy"),
-    PMemoryView("memoryview", "builtins"),
+    PMemoryView("memoryview", BuiltinNames.BUILTINS),
     PMethod("method"),
     PMMap("mmap", "mmap"),
     PNone("NoneType"),
     PNotImplemented("NotImplementedType"),
     PRandom("Random", "_random"),
-    PRange("range", "builtins"),
+    PRange("range", BuiltinNames.BUILTINS),
     PReferenceType("ReferenceType", "_weakref"),
     PSentinelIterator("callable_iterator"),
     PForeignArrayIterator("foreign_iterator"),
-    PReverseIterator("reversed", "builtins"),
-    PSet("set", "builtins"),
-    PSlice("slice", "builtins"),
-    PString("str", "builtins"),
+    PReverseIterator("reversed", BuiltinNames.BUILTINS),
+    PSet("set", BuiltinNames.BUILTINS),
+    PSlice("slice", BuiltinNames.BUILTINS),
+    PString("str", BuiltinNames.BUILTINS),
     PTraceback("traceback"),
-    PTuple("tuple", "builtins"),
-    PythonClass("type", "builtins"),
+    PTuple("tuple", BuiltinNames.BUILTINS),
+    PythonClass("type", BuiltinNames.BUILTINS),
     PythonModule("module"),
-    PythonObject("object", "builtins"),
-    Super("super", "builtins"),
+    PythonObject("object", BuiltinNames.BUILTINS),
+    Super("super", BuiltinNames.BUILTINS),
     PCode("code"),
-    PZip("zip", "builtins"),
+    PZip("zip", BuiltinNames.BUILTINS),
     PZipImporter("zipimporter", "zipimport"),
-    PBuffer("buffer", "builtins"),
+    PBuffer("buffer", BuiltinNames.BUILTINS),
     PThread("start_new_thread", "_thread"),
     PLock("LockType", "_thread"),
     PRLock("RLock", "_thread"),
     PSocket("socket", "_socket"),
-    PStaticmethod("staticmethod", "builtins"),
-    PClassmethod("classmethod", "builtins"),
+    PStaticmethod("staticmethod", BuiltinNames.BUILTINS),
+    PClassmethod("classmethod", BuiltinNames.BUILTINS),
     PScandirIterator("ScandirIterator", "posix"),
     PDirEntry("DirEntry", "posix"),
     PLZMACompressor("LZMACompressor", "_lzma"),
@@ -114,77 +114,77 @@ public enum PythonBuiltinClassType implements LazyPythonClass {
     // Errors and exceptions:
 
     // everything after BaseException is considered to be an exception
-    PBaseException("BaseException", "builtins"),
-    SystemExit("SystemExit", "builtins"),
-    KeyboardInterrupt("KeyboardInterrupt", "builtins"),
-    GeneratorExit("GeneratorExit", "builtins"),
-    Exception("Exception", "builtins"),
-    StopIteration("StopIteration", "builtins"),
-    ArithmeticError("ArithmeticError", "builtins"),
-    FloatingPointError("FloatingPointError", "builtins"),
-    OverflowError("OverflowError", "builtins"),
-    ZeroDivisionError("ZeroDivisionError", "builtins"),
-    AssertionError("AssertionError", "builtins"),
-    AttributeError("AttributeError", "builtins"),
-    BufferError("BufferError", "builtins"),
-    EOFError("EOFError", "builtins"),
-    ImportError("ImportError", "builtins"),
-    ModuleNotFoundError("ModuleNotFoundError", "builtins"),
-    LookupError("LookupError", "builtins"),
-    IndexError("IndexError", "builtins"),
-    KeyError("KeyError", "builtins"),
-    MemoryError("MemoryError", "builtins"),
-    NameError("NameError", "builtins"),
-    UnboundLocalError("UnboundLocalError", "builtins"),
-    OSError("OSError", "builtins"),
-    BlockingIOError("BlockingIOError", "builtins"),
-    ChildProcessError("ChildProcessError", "builtins"),
-    ConnectionError("ConnectionError", "builtins"),
-    BrokenPipeError("BrokenPipeError", "builtins"),
-    ConnectionAbortedError("ConnectionAbortedError", "builtins"),
-    ConnectionRefusedError("ConnectionRefusedError", "builtins"),
-    ConnectionResetError("ConnectionResetError", "builtins"),
-    FileExistsError("FileExistsError", "builtins"),
-    FileNotFoundError("FileNotFoundError", "builtins"),
-    InterruptedError("InterruptedError", "builtins"),
-    IsADirectoryError("IsADirectoryError", "builtins"),
-    NotADirectoryError("NotADirectoryError", "builtins"),
-    PermissionError("PermissionError", "builtins"),
-    ProcessLookupError("ProcessLookupError", "builtins"),
-    TimeoutError("TimeoutError", "builtins"),
+    PBaseException("BaseException", BuiltinNames.BUILTINS),
+    SystemExit("SystemExit", BuiltinNames.BUILTINS),
+    KeyboardInterrupt("KeyboardInterrupt", BuiltinNames.BUILTINS),
+    GeneratorExit("GeneratorExit", BuiltinNames.BUILTINS),
+    Exception("Exception", BuiltinNames.BUILTINS),
+    StopIteration("StopIteration", BuiltinNames.BUILTINS),
+    ArithmeticError("ArithmeticError", BuiltinNames.BUILTINS),
+    FloatingPointError("FloatingPointError", BuiltinNames.BUILTINS),
+    OverflowError("OverflowError", BuiltinNames.BUILTINS),
+    ZeroDivisionError("ZeroDivisionError", BuiltinNames.BUILTINS),
+    AssertionError("AssertionError", BuiltinNames.BUILTINS),
+    AttributeError("AttributeError", BuiltinNames.BUILTINS),
+    BufferError("BufferError", BuiltinNames.BUILTINS),
+    EOFError("EOFError", BuiltinNames.BUILTINS),
+    ImportError("ImportError", BuiltinNames.BUILTINS),
+    ModuleNotFoundError("ModuleNotFoundError", BuiltinNames.BUILTINS),
+    LookupError("LookupError", BuiltinNames.BUILTINS),
+    IndexError("IndexError", BuiltinNames.BUILTINS),
+    KeyError("KeyError", BuiltinNames.BUILTINS),
+    MemoryError("MemoryError", BuiltinNames.BUILTINS),
+    NameError("NameError", BuiltinNames.BUILTINS),
+    UnboundLocalError("UnboundLocalError", BuiltinNames.BUILTINS),
+    OSError("OSError", BuiltinNames.BUILTINS),
+    BlockingIOError("BlockingIOError", BuiltinNames.BUILTINS),
+    ChildProcessError("ChildProcessError", BuiltinNames.BUILTINS),
+    ConnectionError("ConnectionError", BuiltinNames.BUILTINS),
+    BrokenPipeError("BrokenPipeError", BuiltinNames.BUILTINS),
+    ConnectionAbortedError("ConnectionAbortedError", BuiltinNames.BUILTINS),
+    ConnectionRefusedError("ConnectionRefusedError", BuiltinNames.BUILTINS),
+    ConnectionResetError("ConnectionResetError", BuiltinNames.BUILTINS),
+    FileExistsError("FileExistsError", BuiltinNames.BUILTINS),
+    FileNotFoundError("FileNotFoundError", BuiltinNames.BUILTINS),
+    InterruptedError("InterruptedError", BuiltinNames.BUILTINS),
+    IsADirectoryError("IsADirectoryError", BuiltinNames.BUILTINS),
+    NotADirectoryError("NotADirectoryError", BuiltinNames.BUILTINS),
+    PermissionError("PermissionError", BuiltinNames.BUILTINS),
+    ProcessLookupError("ProcessLookupError", BuiltinNames.BUILTINS),
+    TimeoutError("TimeoutError", BuiltinNames.BUILTINS),
     ZipImportError("ZipImportError", "zipimport"),
     ZLibError("error", "zlib"),
     LZMAError("LZMAError", "_lzma"),
 
     // todo: all OS errors
 
-    ReferenceError("ReferenceError", "builtins"),
-    RuntimeError("RuntimeError", "builtins"),
-    NotImplementedError("NotImplementedError", "builtins"),
-    SyntaxError("SyntaxError", "builtins"),
-    IndentationError("IndentationError", "builtins"),
-    TabError("TabError", "builtins"),
-    SystemError("SystemError", "builtins"),
-    TypeError("TypeError", "builtins"),
-    ValueError("ValueError", "builtins"),
-    UnicodeError("UnicodeError", "builtins"),
-    UnicodeDecodeError("UnicodeDecodeError", "builtins"),
-    UnicodeEncodeError("UnicodeEncodeError", "builtins"),
-    UnicodeTranslateError("UnicodeTranslateError", "builtins"),
-    RecursionError("RecursionError", "builtins"),
+    ReferenceError("ReferenceError", BuiltinNames.BUILTINS),
+    RuntimeError("RuntimeError", BuiltinNames.BUILTINS),
+    NotImplementedError("NotImplementedError", BuiltinNames.BUILTINS),
+    SyntaxError("SyntaxError", BuiltinNames.BUILTINS),
+    IndentationError("IndentationError", BuiltinNames.BUILTINS),
+    TabError("TabError", BuiltinNames.BUILTINS),
+    SystemError("SystemError", BuiltinNames.BUILTINS),
+    TypeError("TypeError", BuiltinNames.BUILTINS),
+    ValueError("ValueError", BuiltinNames.BUILTINS),
+    UnicodeError("UnicodeError", BuiltinNames.BUILTINS),
+    UnicodeDecodeError("UnicodeDecodeError", BuiltinNames.BUILTINS),
+    UnicodeEncodeError("UnicodeEncodeError", BuiltinNames.BUILTINS),
+    UnicodeTranslateError("UnicodeTranslateError", BuiltinNames.BUILTINS),
+    RecursionError("RecursionError", BuiltinNames.BUILTINS),
 
     // warnings
-    Warning("Warning", "builtins"),
-    BytesWarning("BytesWarning", "builtins"),
-    DeprecationWarning("DeprecationWarning", "builtins"),
-    FutureWarning("FutureWarning", "builtins"),
-    ImportWarning("ImportWarning", "builtins"),
-    PendingDeprecationWarning("PendingDeprecationWarning", "builtins"),
-    ResourceWarning("ResourceWarning", "builtins"),
-    RuntimeWarning("RuntimeWarning", "builtins"),
-    SyntaxWarning("SyntaxWarning", "builtins"),
-    UnicodeWarning("UnicodeWarning", "builtins"),
-    UserWarning("UserWarning", "builtins");
+    Warning("Warning", BuiltinNames.BUILTINS),
+    BytesWarning("BytesWarning", BuiltinNames.BUILTINS),
+    DeprecationWarning("DeprecationWarning", BuiltinNames.BUILTINS),
+    FutureWarning("FutureWarning", BuiltinNames.BUILTINS),
+    ImportWarning("ImportWarning", BuiltinNames.BUILTINS),
+    PendingDeprecationWarning("PendingDeprecationWarning", BuiltinNames.BUILTINS),
+    ResourceWarning("ResourceWarning", BuiltinNames.BUILTINS),
+    RuntimeWarning("RuntimeWarning", BuiltinNames.BUILTINS),
+    SyntaxWarning("SyntaxWarning", BuiltinNames.BUILTINS),
+    UnicodeWarning("UnicodeWarning", BuiltinNames.BUILTINS),
+    UserWarning("UserWarning", BuiltinNames.BUILTINS);
 
     private final String name;
     private final Shape instanceShape;