[GR-21590] Update imports

PullRequest: graalpython/2817

Author: msimacek

ci.jsonnet

@@ -1 +1 @@
-{ "overlay": "b676f3e9a8ed96de8f3df5b9f20677e5d15586a9" }
+{ "overlay": "1d05a5fbcb17e942af2c50382364c94b82bc7f85" }

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

@@ -50,7 +50,8 @@
 else:
     TAGS_DIR = "null"
 
-TIMEOUT = 90 * 60
+RUN_TIMEOUT = 90 * 60
+RETAG_TIMEOUT = 20 * 60
 RUNNER = os.path.join(os.path.dirname(__file__), "run_cpython_test.py")
 LINE = "=" * 80
 
@@ -107,14 +108,16 @@ def test_tagged():
             if os.environ.get("ENABLE_THREADED_GRAALPYTEST") == "true":
                 run_serialize_out(cmd)
             else:
-                rcode = run_with_timeout(cmd).returncode
+                rcode = run_with_timeout(cmd, timeout=RUN_TIMEOUT).returncode
                 if rcode:
                     raise subprocess.CalledProcessError(rcode, cmd)
                 print(working_test[0], "was finished.")
 
     def run_serialize_out(cmd):
-        result = run_with_timeout(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+        result = run_with_timeout(cmd, timeout=RUN_TIMEOUT, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
         append_out = "-v" in sys.argv
+        if result.returncode == 124:
+            raise subprocess.TimeoutExpired(cmd=cmd, timeout=RUN_TIMEOUT)
         if result.returncode:
             message = f"{working_test[0]} failed with exit code {result.returncode}.\n"
             append_out = True
@@ -196,14 +199,14 @@ def parse_unittest_output(output):
             return
 
 
-def run_with_timeout(cmd, *args, **kwargs):
+def run_with_timeout(cmd, *, timeout, **kwargs):
     p = subprocess.getstatusoutput("which timeout" if sys.platform != 'darwin' else "which gtimeout")
     if p[0] != 0:
         print("Cannot find the 'timeout' GNU tool. Do you have coreutils installed?")
     else:
-        timeout = p[1].strip()
-        cmd = [timeout, "-s", "9", str(TIMEOUT)] + cmd
-    return subprocess.run(cmd, *args, **kwargs)
+        timeout_cmd = p[1].strip()
+        cmd = [timeout_cmd, "-k", "10", str(timeout)] + cmd
+    return subprocess.run(cmd, **kwargs)
 
 
 def main():
@@ -213,21 +216,23 @@ def main():
     glob_pattern = os.path.join(os.path.dirname(test.__file__), "test_*.py")
     retag = False
     maxrepeats = 4
+    timeout = None
     for arg in sys.argv[1:]:
         if arg == "--retag":
             retag = True
         elif arg.startswith("--maxrepeats="):
             maxrepeats = int(arg.partition("=")[2])
         elif arg.startswith("--timeout="):
-            global TIMEOUT
-            TIMEOUT = arg.partition("=")[2]
+            timeout = int(arg.partition("=")[2])
         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)
 
+    if not timeout:
+        timeout = RETAG_TIMEOUT if retag else RUN_TIMEOUT
     testfiles = glob.glob(glob_pattern)
     testfiles += glob.glob(glob_pattern.replace(".py", "/__init__.py"))
 
@@ -268,15 +273,15 @@ def main():
             cmd.append(testfile)
 
             print(shlex.join(cmd))
-            p = run_with_timeout(cmd, errors='backslashreplace', **kwargs)
+            p = run_with_timeout(cmd, timeout=timeout, errors='backslashreplace', **kwargs)
             print("*stdout*")
             print(p.stdout)
             print("*stderr*")
             print(p.stderr)
 
-            if p.returncode == -9:
+            if p.returncode == 124:
                 print(
-                    f"\nTimeout (return code -9)\nyou can try to increase the current timeout {TIMEOUT}s by using --timeout=NNN")
+                    f"\nTimed out\nYou can try to increase the current timeout {timeout}s by using --timeout=NNN")
 
             passing_tests = set()
             failing_tests = set()

mx.graalpython/mx_graalpython.py

@@ -425,6 +425,7 @@ def retag_unittests(args):
     parser.add_argument('--inspect', action='store_true')
     parser.add_argument('-debug-java', action='store_true')
     parser.add_argument('--jvm', action='store_true')
+    parser.add_argument('--timeout')
     parsed_args, remaining_args = parser.parse_known_args(args)
     env = os.environ.copy()
     env.update(
@@ -444,6 +445,8 @@ def retag_unittests(args):
         'graalpython/com.oracle.graal.python.test/src/tests/test_tagged_unittests.py',
         '--retag'
     ]
+    if parsed_args.timeout:
+        args += [f'--timeout={parsed_args.timeout}']
     vm = python_svm() if not parsed_args.jvm else python_gvm()
     if parsed_args.jvm:
         args += ['-ea']
@@ -1682,25 +1685,11 @@ def update_import_cmd(args):
         vc.git_command(SUITE.dir, ["checkout", "-b", f"update/GR-21590/{datetime.datetime.now().strftime('%d%m%y')}"])
         current_branch = vc.active_branch(SUITE.dir)
 
-    suite_py_files = []
-    local_names = []
-    repos = []
-
-    # find all relevant other repos that may need updating
-    for sibling in os.listdir(os.path.join(SUITE.dir, "..")):
-        if sibling.startswith("graalpython"):
-            dd = os.path.join(SUITE.dir, "..", sibling)
-            jsonnetfile = os.path.join(dd, "ci.jsonnet")
-            if os.path.exists(jsonnetfile):
-                local_names.append(sibling)
-                repos.append(dd)
-                for dirpath, dirnames, filenames in os.walk(dd):
-                    mx_dirs = list(filter(lambda x: x.startswith("mx."), dirnames))
-                    if mx_dirs:
-                        dirnames[:] = mx_dirs # don't go deeper once we found some mx dirs
-                    dirnames[:] = list(filter(lambda x: not (x.startswith(".") or x.startswith("__")), dirnames))
-                    if "suite.py" in filenames:
-                        suite_py_files.append(join(dirpath, "suite.py"))
+    local_names = ["graalpython", "graalpython-apptests"]
+    repos = [os.path.join(SUITE.dir, "..", name) for name in local_names]
+    suite_py_files = [os.path.join(SUITE.dir, "..", name, f"mx.{name}", "suite.py") for name in local_names]
+    for suite_py in suite_py_files:
+        assert os.path.isfile(suite_py), f"Cannot find {suite_py}"
 
     # make sure all other repos are clean and on the same branch
     for d in repos:

mx.graalpython/suite.py

@@ -5,7 +5,7 @@
     #  METADATA
     #
     # --------------------------------------------------------------------------------------------------------------
-    "mxversion": "6.17.0",
+    "mxversion": "6.24.0",
     "name": "graalpython",
     "versionConflictResolution": "latest",
 
@@ -44,31 +44,31 @@
             },
             {
                 "name": "sdk",
-                "version": "27509a3069b251692a860ef13a577832d8260f9f",
+                "version": "cab859d5d1a6559799cbaf5af441b54531798fda",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ]
             },
             {
                 "name": "tools",
-                "version": "27509a3069b251692a860ef13a577832d8260f9f",
+                "version": "cab859d5d1a6559799cbaf5af441b54531798fda",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ],
             },
             {
                 "name": "sulong",
-                "version": "27509a3069b251692a860ef13a577832d8260f9f",
+                "version": "cab859d5d1a6559799cbaf5af441b54531798fda",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ]
             },
             {
                 "name": "regex",
-                "version": "27509a3069b251692a860ef13a577832d8260f9f",
+                "version": "cab859d5d1a6559799cbaf5af441b54531798fda",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},