[GR-21590] Update imports

msimacek · msimacek · commit 9338e0373116 · 2021-05-11T12:53:40.000Z
PullRequest: graalpython/1791
diff --git a/ci.jsonnet b/ci.jsonnet
@@ -1 +1 @@
-{ "overlay": "ea08890c99fa458eedbe654f6d413cfbd995f8a8" }
+{ "overlay": "66031a14f4fa7802efbd25dc758e08a4c94f2579" }
diff --git a/graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/interop/JavaInteropTest.java b/graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/interop/JavaInteropTest.java
@@ -336,7 +336,7 @@ boolean isMemberInvocable(String member) {
             @ExportMessage
             Object invokeMember(String member, Object... arguments) throws ArityException, UnknownIdentifierException {
                 if (arguments.length != 0) {
-                    throw ArityException.create(0, arguments.length);
+                    throw ArityException.create(0, 0, arguments.length);
                 } else if (!member.equals("getMyName")) {
                     throw UnknownIdentifierException.create(member);
                 } else {
@@ -392,7 +392,7 @@ boolean isExecutable() {
             @ExportMessage
             Object execute(Object... arguments) throws ArityException {
                 if (arguments.length != 0) {
-                    throw ArityException.create(0, arguments.length);
+                    throw ArityException.create(0, 0, arguments.length);
                 } else {
                     return self.getMyName();
                 }
diff --git a/graalpython/com.oracle.graal.python.test/src/graalpytest.py b/graalpython/com.oracle.graal.python.test/src/graalpytest.py
@@ -59,6 +59,8 @@
     'test_import',
     'test_subprocess',
     'test_posix',
+    # trying to avoid transient issues there, not sure about the reason
+    'test_unittest',
 ]
 
 
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/test_tagged_unittests.py b/graalpython/com.oracle.graal.python.test/src/tests/test_tagged_unittests.py
@@ -37,13 +37,11 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-import sys
-
 import glob
-import test
-
 import os
 import subprocess
+import sys
+import test
 
 if os.environ.get("ENABLE_CPYTHON_TAGGED_UNITTESTS") == "true" or __name__ == "__main__":
     TAGS_DIR = os.path.join(os.path.dirname(__file__), "unittest_tags")
@@ -225,23 +223,31 @@ def main():
             print("*stderr*")
             print(p.stderr)
 
-            passing_tests = []
+            if p.returncode == -9:
+                print(
+                    f"\nTimeout (return code -9)\nyou can try to increase the current timeout {tout}s by using --timeout=NNN")
+
+            passing_tests = set()
+            failing_tests = set()
 
             # n.b.: we add a '*' in the front, so that unittests doesn't add
             # its own asterisks, because now this is already a pattern
             for funcname, classname, result in parse_unittest_output(p.stderr):
                 # We consider skipped tests as passing in order to avoid a situation where a Linux run
                 # untags a Darwin-only test and vice versa
+                pattern = f"*{classname}.{funcname}"
                 if result == 'ok' or result.startswith('skipped'):
-                    passing_tests.append(f"*{classname}.{funcname}")
+                    passing_tests.add(pattern)
+                else:
+                    failing_tests.add(pattern)
 
             with open(tagfile, "w") as f:
-                for passing_test in sorted(passing_tests):
+                for passing_test in sorted(passing_tests - failing_tests):
                     f.write(passing_test)
                     f.write("\n")
             if not passing_tests:
                 os.unlink(tagfile)
-                print("No successful tests detected (you can try to increase the timeout by using --timeout=NNN)")
+                print("No successful tests detected")
                 break
 
             if p.returncode == 0:
@@ -250,10 +256,6 @@ def main():
                     continue
                 print(f"Suite succeeded with {len(passing_tests)} tests")
                 break
-            elif p.returncode == -9:
-                print(
-                    f"\nTimeout (return code -9)\nyou can try to increase the current timeout {tout}s by using --timeout=NNN")
-                break
             else:
                 print(f"Suite failed, retrying with {len(passing_tests)} tests")
 
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_concurrent_futures.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_concurrent_futures.txt
@@ -18,5 +18,5 @@
 *graalpython.lib-python.3.test.test_concurrent_futures.FutureTests.test_result_with_success
 *graalpython.lib-python.3.test.test_concurrent_futures.FutureTests.test_result_with_timeout
 *graalpython.lib-python.3.test.test_concurrent_futures.FutureTests.test_running
-*graalpython.lib-python.3.test.test_concurrent_futures.ProcessPoolForkProcessPoolExecutorTest.test_max_workers_too_large
 *graalpython.lib-python.3.test.test_concurrent_futures.ProcessPoolForkProcessPoolExecutorTest.test_no_stale_references
+*graalpython.lib-python.3.test.test_concurrent_futures.ProcessPoolForkProcessPoolShutdownTest.test_run_after_shutdown
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_doctest2.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_doctest2.txt
@@ -0,0 +1 @@
+*graalpython.lib-python.3.test.test_doctest2.TestMain.test_main
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_httpservers.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_httpservers.txt
@@ -35,3 +35,4 @@
 *graalpython.lib-python.3.test.test_httpservers.BaseHTTPServerTestCase.test_version_none
 *graalpython.lib-python.3.test.test_httpservers.BaseHTTPServerTestCase.test_version_none_get
 *graalpython.lib-python.3.test.test_httpservers.CGIHTTPServerTestCase.test_authorization
+*graalpython.lib-python.3.test.test_httpservers.CGIHTTPServerTestCase.test_headers_and_content
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_import.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_import.txt
@@ -15,7 +15,6 @@
 *graalpython.lib-python.3.test.test_import.__init__.GetSourcefileTests.test_get_sourcefile_no_source
 *graalpython.lib-python.3.test.test_import.__init__.ImportTests.test_bogus_fromlist
 *graalpython.lib-python.3.test.test_import.__init__.ImportTests.test_case_sensitivity
-*graalpython.lib-python.3.test.test_import.__init__.ImportTests.test_concurrency
 *graalpython.lib-python.3.test.test_import.__init__.ImportTests.test_delete_builtins_import
 *graalpython.lib-python.3.test.test_import.__init__.ImportTests.test_dll_dependency_import
 *graalpython.lib-python.3.test.test_import.__init__.ImportTests.test_double_const
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_importlib.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_importlib.txt
@@ -629,8 +629,6 @@
 *test.test_importlib.test_abc.Frozen_InspectLoader.test_subclasses
 *test.test_importlib.test_abc.Frozen_InspectLoader.test_superclasses
 *test.test_importlib.test_abc.Frozen_InspectLoaderDefaultsTests.test_get_source
-*test.test_importlib.test_abc.Frozen_InspectLoaderDefaultsTests.test_get_source
-*test.test_importlib.test_abc.Frozen_InspectLoaderDefaultsTests.test_is_package
 *test.test_importlib.test_abc.Frozen_InspectLoaderDefaultsTests.test_is_package
 *test.test_importlib.test_abc.Frozen_InspectLoaderGetCodeTests.test_get_code
 *test.test_importlib.test_abc.Frozen_InspectLoaderGetCodeTests.test_get_code_source_is_None
@@ -697,8 +695,6 @@
 *test.test_importlib.test_abc.Source_InspectLoader.test_subclasses
 *test.test_importlib.test_abc.Source_InspectLoader.test_superclasses
 *test.test_importlib.test_abc.Source_InspectLoaderDefaultsTests.test_get_source
-*test.test_importlib.test_abc.Source_InspectLoaderDefaultsTests.test_get_source
-*test.test_importlib.test_abc.Source_InspectLoaderDefaultsTests.test_is_package
 *test.test_importlib.test_abc.Source_InspectLoaderDefaultsTests.test_is_package
 *test.test_importlib.test_abc.Source_InspectLoaderGetCodeTests.test_get_code
 *test.test_importlib.test_abc.Source_InspectLoaderGetCodeTests.test_get_code_source_is_None
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_weakref.txt b/graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_weakref.txt
@@ -31,6 +31,7 @@
 *graalpython.lib-python.3.test.test_weakref.ReferencesTestCase.test_callback_in_cycle_4
 *graalpython.lib-python.3.test.test_weakref.ReferencesTestCase.test_callbacks_protected
 *graalpython.lib-python.3.test.test_weakref.ReferencesTestCase.test_cfunction
+*graalpython.lib-python.3.test.test_weakref.ReferencesTestCase.test_classes
 *graalpython.lib-python.3.test.test_weakref.ReferencesTestCase.test_constructor_kwargs
 *graalpython.lib-python.3.test.test_weakref.ReferencesTestCase.test_equality
 *graalpython.lib-python.3.test.test_weakref.ReferencesTestCase.test_hashing
@@ -63,6 +64,7 @@
 *graalpython.lib-python.3.test.test_weakref.WeakKeyDictionaryTestCase.test_values
 *graalpython.lib-python.3.test.test_weakref.WeakKeyDictionaryTestCase.test_write
 *graalpython.lib-python.3.test.test_weakref.WeakMethodTestCase.test_alive
+*graalpython.lib-python.3.test.test_weakref.WeakMethodTestCase.test_callback_when_object_dead
 *graalpython.lib-python.3.test.test_weakref.WeakMethodTestCase.test_equality
 *graalpython.lib-python.3.test.test_weakref.WeakMethodTestCase.test_hashing
 *graalpython.lib-python.3.test.test_weakref.WeakMethodTestCase.test_no_cycles
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ExternalFunctionNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ExternalFunctionNodes.java
@@ -544,7 +544,7 @@ public Object execute(VirtualFrame frame, String name, Object callable, Object[]
                 throw ensureRaiseNode().raise(PythonBuiltinClassType.TypeError, ErrorMessages.CALLING_NATIVE_FUNC_FAILED, name, e);
             } catch (ArityException e) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                throw ensureRaiseNode().raise(PythonBuiltinClassType.TypeError, ErrorMessages.CALLING_NATIVE_FUNC_EXPECTED_ARGS, name, e.getExpectedArity(), e.getActualArity());
+                throw ensureRaiseNode().raise(PythonBuiltinClassType.TypeError, ErrorMessages.CALLING_NATIVE_FUNC_EXPECTED_ARGS, name, e.getExpectedMinArity(), e.getActualArity());
             } finally {
                 // special case after calling a C function: transfer caught exception back to frame
                 // to simulate the global state semantics
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ImpModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ImpModuleBuiltins.java
@@ -408,7 +408,7 @@ private Object initCApiModule(TruffleObject sulongLibrary, String initFuncName,
             } catch (ArityException e) {
                 // In case of multi-phase init, the init function may take more than one arguments.
                 // However, CPython gracefully ignores that. So, we pass just NULL pointers.
-                Object[] arguments = new Object[e.getExpectedArity()];
+                Object[] arguments = new Object[e.getExpectedMinArity()];
                 Arrays.fill(arguments, PNone.NO_VALUE);
                 nativeResult = interop.execute(pyinitFunc, arguments);
             }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/HandleCache.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/HandleCache.java
@@ -97,7 +97,7 @@ public Object execute(Object[] arguments,
         try {
             if (arguments.length != 1) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                throw ArityException.create(1, arguments.length);
+                throw ArityException.create(1, 1, arguments.length);
             }
             return getOrInsertNode.execute(this, (long) arguments[0]);
         } finally {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/ManagedMethodWrappers.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/ManagedMethodWrappers.java
@@ -136,7 +136,7 @@ public Object execute(Object[] arguments,
             try {
                 if (arguments.length != 3) {
                     CompilerDirectives.transferToInterpreterAndInvalidate();
-                    throw ArityException.create(3, arguments.length);
+                    throw ArityException.create(3, 3, arguments.length);
                 }
 
                 // convert args
@@ -179,7 +179,7 @@ public Object execute(Object[] arguments,
             try {
                 if (arguments.length != 1) {
                     CompilerDirectives.transferToInterpreterAndInvalidate();
-                    throw ArityException.create(1, arguments.length);
+                    throw ArityException.create(1, 1, arguments.length);
                 }
 
                 // convert args
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/NativeReferenceCache.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/NativeReferenceCache.java
@@ -100,7 +100,7 @@ Object execute(Object[] arguments,
                 return resolveNativeReferenceNode.execute(arguments[0], arguments[1], steal);
             }
             CompilerDirectives.transferToInterpreterAndInvalidate();
-            throw ArityException.create(1, arguments.length);
+            throw ArityException.create(1, 1, arguments.length);
         } finally {
             gil.release(mustRelease);
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/PyProcsWrapper.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/PyProcsWrapper.java
@@ -144,7 +144,7 @@ protected Object execute(Object[] arguments,
             try {
                 if (arguments.length != 2) {
                     CompilerDirectives.transferToInterpreterAndInvalidate();
-                    throw ArityException.create(2, arguments.length);
+                    throw ArityException.create(2, 2, arguments.length);
                 }
                 try {
                     return incRefNode.inc(toSulongNode.execute(executeNode.executeObject(null, lib.getDelegate(this), toJavaNode.execute(arguments[0]), toJavaNode.execute(arguments[1]))));
@@ -179,7 +179,7 @@ protected int execute(Object[] arguments,
             try {
                 if (arityProfile.profile(arguments.length != 3)) {
                     CompilerDirectives.transferToInterpreterAndInvalidate();
-                    throw ArityException.create(3, arguments.length);
+                    throw ArityException.create(3, 3, arguments.length);
                 }
                 try {
                     callTernaryMethodNode.execute(null, lib.getDelegate(this), toJavaNode.execute(arguments[0]), toJavaNode.execute(arguments[1]), toJavaNode.execute(arguments[2]));
@@ -221,7 +221,7 @@ protected Object execute(Object[] arguments,
             try {
                 if (arguments.length != 2) {
                     CompilerDirectives.transferToInterpreterAndInvalidate();
-                    throw ArityException.create(2, arguments.length);
+                    throw ArityException.create(2, 2, arguments.length);
                 }
                 assert arguments[1] instanceof Number;
                 try {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/PyTruffleObjectAlloc.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/PyTruffleObjectAlloc.java
@@ -84,7 +84,7 @@ Object execute(Object[] arguments,
         try {
             if (arguments.length != 2) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                throw ArityException.create(2, arguments.length);
+                throw ArityException.create(2, 2, arguments.length);
             }
 
             Object allocatedObject = arguments[0];
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/PyTruffleObjectFree.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/PyTruffleObjectFree.java
@@ -78,7 +78,7 @@ Object execute(Object[] arguments,
         try {
             if (arguments.length != 1) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                throw ArityException.create(1, arguments.length);
+                throw ArityException.create(1, 1, arguments.length);
             }
             return freeNode.execute(arguments[0]);
         } finally {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/common/CExtParseArgumentsNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/common/CExtParseArgumentsNode.java
@@ -1179,7 +1179,7 @@ static void doExecuteConverterGeneric(ConversionNodeSupplier supplier, int index
                 raiseNode.raiseIntWithoutFrame(0, PythonBuiltinClassType.SystemError, ErrorMessages.CALLING_ARG_CONVERTER_FAIL_INCOMPATIBLE_PARAMS, e.getSuppliedValues());
             } catch (ArityException e) {
                 CompilerDirectives.transferToInterpreter();
-                raiseNode.raiseIntWithoutFrame(0, PythonBuiltinClassType.SystemError, ErrorMessages.CALLING_ARG_CONVERTER_FAIL_EXPECTED_D_GOT_P, e.getExpectedArity(),
+                raiseNode.raiseIntWithoutFrame(0, PythonBuiltinClassType.SystemError, ErrorMessages.CALLING_ARG_CONVERTER_FAIL_EXPECTED_D_GOT_P, e.getExpectedMinArity(),
                                 e.getActualArity());
             } catch (UnsupportedMessageException e) {
                 CompilerDirectives.transferToInterpreter();
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyContextFunctions.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyContextFunctions.java
@@ -228,7 +228,7 @@ static void checkMode(FunctionMode actualMode, FunctionMode... allowedModes) {
         protected static void checkArity(Object[] arguments, int expectedArity) throws ArityException {
             if (arguments.length != expectedArity) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                throw ArityException.create(expectedArity, arguments.length);
+                throw ArityException.create(expectedArity, expectedArity, arguments.length);
             }
         }
     }
@@ -605,11 +605,11 @@ protected void checkArguments(Object[] arguments) throws ArityException {
             // we also need to account for the HPy context
             if (inplaceOperator.isTernary() && arguments.length != 4) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                throw ArityException.create(4, arguments.length);
+                throw ArityException.create(4, 4, arguments.length);
             }
             if (!inplaceOperator.isTernary() && arguments.length != 3) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                throw ArityException.create(3, arguments.length);
+                throw ArityException.create(3, 3, arguments.length);
             }
         }
 
@@ -1155,7 +1155,7 @@ Object execute(Object[] arguments,
                         @Cached PythonObjectFactory factory) throws ArityException {
             int expectedArity = withSize ? 3 : 2;
             if (arguments.length != expectedArity) {
-                throw ArityException.create(expectedArity, arguments.length);
+                throw ArityException.create(expectedArity, expectedArity, arguments.length);
             }
             GraalHPyContext context = asContextNode.execute(arguments[0]);
             Object charPtr = arguments[1];
@@ -1691,7 +1691,7 @@ static Object doGeneric(GraalHPyCallBuiltinFunction receiver, Object[] arguments
                 try {
                     if (arguments.length != receiver.nPythonArguments + 1) {
                         CompilerDirectives.transferToInterpreterAndInvalidate();
-                        throw ArityException.create(receiver.nPythonArguments + 1, arguments.length);
+                        throw ArityException.create(receiver.nPythonArguments + 1, receiver.nPythonArguments + 1, arguments.length);
                     }
                     GraalHPyContext nativeContext = asContextNode.execute(arguments[0]);
                     Object[] pythonArguments = new Object[receiver.nPythonArguments];
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyInitObject.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyInitObject.java
@@ -101,7 +101,7 @@ Object invokeMember(String key, Object[] arguments,
         boolean mustRelease = gil.acquire();
         try {
             if (arguments.length != 1) {
-                throw ArityException.create(1, arguments.length);
+                throw ArityException.create(1, 1, arguments.length);
             }
 
             switch (key) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/HPyExternalFunctionNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/HPyExternalFunctionNodes.java
@@ -344,7 +344,7 @@ Object doIt(VirtualFrame frame, String name, Object callable, Object[] arguments
             } catch (UnsupportedTypeException | UnsupportedMessageException e) {
                 throw raiseNode.raise(PythonBuiltinClassType.TypeError, "Calling native function %s failed: %m", name, e);
             } catch (ArityException e) {
-                throw raiseNode.raise(PythonBuiltinClassType.TypeError, "Calling native function %s expected %d arguments but got %d.", name, e.getExpectedArity(), e.getActualArity());
+                throw raiseNode.raise(PythonBuiltinClassType.TypeError, "Calling native function %s expected %d arguments but got %d.", name, e.getExpectedMinArity(), e.getActualArity());
             } finally {
                 // special case after calling a C function: transfer caught exception back to frame
                 // to simulate the global state semantics
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/TryExceptNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/statement/TryExceptNode.java
@@ -259,7 +259,7 @@ Object invokeMember(String name, Object[] arguments,
         boolean mustRelease = gil.acquire();
         try {
             if (arguments.length != 1) {
-                throw ArityException.create(1, arguments.length);
+                throw ArityException.create(1, 1, arguments.length);
             }
             return readMember(name, gil).catches(new Object[]{arguments[0]}, gil);
         } finally {
@@ -288,7 +288,7 @@ boolean catches(Object[] arguments,
             boolean mustRelease = gil.acquire();
             try {
                 if (arguments.length != 1) {
-                    throw ArityException.create(1, arguments.length);
+                    throw ArityException.create(1, 1, arguments.length);
                 }
                 Object exception = arguments[0];
                 if (exception instanceof PBaseException) {
diff --git a/graalpython/lib-python/3/test/test_weakref.py b/graalpython/lib-python/3/test/test_weakref.py
@@ -785,6 +785,7 @@ def test_init(self):
         # No exception should be raised here
         gc.collect()
 
+    @support.impl_detail("weakref nondeterministic", graalvm=False)
     def test_classes(self):
         # Check that classes are weakrefable.
         class A(object):
@@ -1050,6 +1051,7 @@ def test_method_dead(self):
         gc.collect()
         self.assertIs(r(), None)
 
+    @support.impl_detail("weakref nondeterministic", graalvm=False)
     def test_callback_when_object_dead(self):
         # Test callback behaviour when object dies first.
         C = self._subclass()
@@ -1131,6 +1133,7 @@ def _ne(a, b):
                 self.assertEqual(q == r, q is r)
                 self.assertEqual(q != r, q is not r)
 
+    @support.impl_detail("weakref nondeterministic", graalvm=False)
     def test_hashing(self):
         # Alive WeakMethods are hashable if the underlying object is
         # hashable.
diff --git a/mx.graalpython/mx_graalpython.py b/mx.graalpython/mx_graalpython.py
diff --git a/mx.graalpython/suite.py b/mx.graalpython/suite.py

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-{ "overlay": "ea08890c99fa458eedbe654f6d413cfbd995f8a8" }`
	`1`	`+{ "overlay": "66031a14f4fa7802efbd25dc758e08a4c94f2579" }`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,8 @@`
`59`	`59`	`'test_import',`
`60`	`60`	`'test_subprocess',`
`61`	`61`	`'test_posix',`
	`62`	`+ # trying to avoid transient issues there, not sure about the reason`
	`63`	`+ 'test_unittest',`
`62`	`64`	`]`
`63`	`65`
`64`	`66`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+*graalpython.lib-python.3.test.test_doctest2.TestMain.test_main`