[GR-22245] [GR-23280] Fix a few builtin tests

PullRequest: graalpython/979

Author: timfel

graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/ConsoleHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, 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
@@ -88,12 +88,15 @@ public void setHistory(BooleanSupplier shouldRecord, IntSupplier getSize, Consum
     public InputStream createInputStream() {
         return new InputStream() {
             byte[] buffer = null;
-            int pos = -1;
+            int pos = 0;
 
             @Override
             public int read() throws IOException {
-                if (buffer == null) {
+                if (pos < 0) {
                     pos = 0;
+                    return -1;
+                } else if (buffer == null) {
+                    assert pos == 0;
                     String line = readLine(false);
                     if (line == null) {
                         return -1;
@@ -102,6 +105,7 @@ public int read() throws IOException {
                 }
                 if (pos == buffer.length) {
                     buffer = null;
+                    pos = -1;
                     return '\n';
                 } else {
                     return buffer[pos++];

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

@@ -117,10 +117,21 @@ def __init__(self):
         self.passed = 0
         self.failed = 0
 
+    def get_useful_frame(self, tb):
+        from traceback import extract_tb
+        frame_summaries = extract_tb(tb)
+        frame_summaries.reverse()
+        for summary in frame_summaries:
+            # Skip frame summary entries that refer to this file. These summaries will mostly be there because of the
+            # assert functions and their location is not interesting.
+            if summary[0] != __file__:
+                return summary
+
+
     def run_safely(self, func, print_immediately=False):
         if verbose:
             with print_lock:
-                print(u"\n\t\u21B3 ", func.__name__, " ", end="")
+                print(u"\n\t\u21B3 ", func.__name__, " ", end="", flush=True)
         try:
             func()
         except BaseException as e:
@@ -132,8 +143,7 @@ def run_safely(self, func, print_immediately=False):
                 code = func.__code__
                 _, _, tb = sys.exc_info()
                 try:
-                    from traceback import extract_tb
-                    filename, line, func, text = extract_tb(tb)[-1]
+                    filename, line, func, text = self.get_useful_frame(tb)
                     self.exceptions.append(
                         ("In test '%s': %s:%d (%s)" % (code.co_filename, filename, line, func), e)
                     )
@@ -152,18 +162,24 @@ def run_test(self, func):
             pass
         else:
             def do_run():
+                start = time.monotonic()
                 r = self.run_safely(func)
+                end = time.monotonic() - start
                 with print_lock:
-                    self.success() if r else self.failure()
+                    self.success(end) if r else self.failure(end)
             ThreadPool.start(do_run)
 
-    def success(self):
+    def success(self, time):
         self.passed += 1
+        if verbose:
+            print("[%.3fs]" % time, end=" ")
         print(".", end="", flush=True)
 
-    def failure(self):
+    def failure(self, time):
         self.failed += 1
         fail_msg = FAIL + BOLD + "F" + ENDC if verbose else "F"
+        if verbose:
+            print("[%.3fs]" % time, end=" ")
         print(fail_msg, end="", flush=True)
 
     def assertIsInstance(self, value, cls):

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

@@ -92,7 +92,7 @@ def fun(self):
             cmd.append(os.path.join(os.path.dirname(test.__file__), "%s.py" % testmod))
             subprocess.check_call(cmd)
             print(working_test[0], "was finished.")
-            
+
         fun.__name__ = "%s[%d/%d]" % (working_test[0], idx + 1, len(WORKING_TESTS))
         return fun
 
@@ -142,6 +142,8 @@ def parse_unittest_output(output):
         elif arg == "--help":
             print(sys.argv[0] + " [--retag] [--maxrepeats=n] [glob]")
         else:
+            if not (arg.endswith(".py") or arg.endswith("*")):
+                arg += ".py"
             glob_pattern = os.path.join(os.path.dirname(test.__file__), arg)
 
     p = subprocess.run(["/usr/bin/which", "timeout" if sys.platform != 'darwin' else 'gtimeout'], **kwargs)

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_builtin.txt

@@ -1,3 +1,32 @@
 *graalpython.lib-python.3.test.test_builtin.BuiltinTest.test_all
 *graalpython.lib-python.3.test.test_builtin.BuiltinTest.test_any
 *graalpython.lib-python.3.test.test_builtin.BuiltinTest.test_bin
+*graalpython.lib-python.3.test.test_builtin.BuiltinTest.test_bug_27936
+*graalpython.lib-python.3.test.test_builtin.BuiltinTest.test_bytearray_extend_error
+*graalpython.lib-python.3.test.test_builtin.BuiltinTest.test_bytearray_translate
+*graalpython.lib-python.3.test.test_builtin.BuiltinTest.test_callable
+*graalpython.lib-python.3.test.test_builtin.BuiltinTest.test_cmp
+*graalpython.lib-python.3.test.test_builtin.BuiltinTest.test_delattr
+*graalpython.lib-python.3.test.test_builtin.BuiltinTest.test_exec
+*graalpython.lib-python.3.test.test_builtin.BuiltinTest.test_exec_redirected
+*graalpython.lib-python.3.test.test_builtin.BuiltinTest.test_hex
+*graalpython.lib-python.3.test.test_builtin.BuiltinTest.test_id
+*graalpython.lib-python.3.test.test_builtin.BuiltinTest.test_isinstance
+*graalpython.lib-python.3.test.test_builtin.BuiltinTest.test_issubclass
+*graalpython.lib-python.3.test.test_builtin.BuiltinTest.test_map
+*graalpython.lib-python.3.test.test_builtin.BuiltinTest.test_neg
+*graalpython.lib-python.3.test.test_builtin.BuiltinTest.test_next
+*graalpython.lib-python.3.test.test_builtin.BuiltinTest.test_oct
+*graalpython.lib-python.3.test.test_builtin.BuiltinTest.test_open_default_encoding
+*graalpython.lib-python.3.test.test_builtin.BuiltinTest.test_repr
+*graalpython.lib-python.3.test.test_builtin.BuiltinTest.test_round_large
+*graalpython.lib-python.3.test.test_builtin.BuiltinTest.test_type
+*graalpython.lib-python.3.test.test_builtin.BuiltinTest.test_zip
+*graalpython.lib-python.3.test.test_builtin.BuiltinTest.test_zip_bad_iterable
+*graalpython.lib-python.3.test.test_builtin.PtyTests.test_input_no_stdout_fileno
+*graalpython.lib-python.3.test.test_builtin.PtyTests.test_input_tty
+*graalpython.lib-python.3.test.test_builtin.PtyTests.test_input_tty_non_ascii
+*graalpython.lib-python.3.test.test_builtin.PtyTests.test_input_tty_non_ascii_unicode_errors
+*graalpython.lib-python.3.test.test_builtin.TestBreakpoint.test_breakpoint_with_passthru_error
+*graalpython.lib-python.3.test.test_builtin.TestSorted.test_basic
+*graalpython.lib-python.3.test.test_builtin.TestSorted.test_inputtypes

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

@@ -25,10 +25,12 @@
  */
 package com.oracle.graal.python.builtins;
 
+import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
 @Retention(RetentionPolicy.RUNTIME)
+@Repeatable(value = Builtins.class)
 public @interface Builtin {
 
     String name() default "";

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

@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2020, 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.
+ */
+package com.oracle.graal.python.builtins;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Builtins {
+    Builtin[] value();
+}

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

@@ -33,14 +33,14 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import com.oracle.graal.python.util.BiConsumer;
 
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.function.PBuiltinFunction;
 import com.oracle.graal.python.builtins.objects.type.PythonBuiltinClass;
 import com.oracle.graal.python.nodes.function.BuiltinFunctionRootNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.runtime.PythonCore;
+import com.oracle.graal.python.util.BiConsumer;
 import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.dsl.NodeFactory;
@@ -117,8 +117,15 @@ private void initializeEachFactoryWith(BiConsumer<NodeFactory<? extends PythonBu
         List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> factories = getNodeFactories();
         assert factories != null : "No factories found. Override getFactories() to resolve this.";
         for (NodeFactory<? extends PythonBuiltinBaseNode> factory : factories) {
-            Builtin builtin = factory.getNodeClass().getAnnotation(Builtin.class);
-            func.accept(factory, builtin);
+            Boolean needsFrame = null;
+            for (Builtin builtin : factory.getNodeClass().getAnnotationsByType(Builtin.class)) {
+                if (needsFrame == null) {
+                    needsFrame = builtin.needsFrame();
+                } else if (needsFrame != builtin.needsFrame()) {
+                    throw new IllegalStateException(String.format("Implementation error in %s: all @Builtin annotations must agree if the node needs a frame.", factory.getNodeClass().getName()));
+                }
+                func.accept(factory, builtin);
+            }
         }
     }