make pylint happy, run json parsing tests as style gate

Author: timfel

mx.graalpython/mx_graalpython.py

@@ -1366,6 +1366,7 @@ def update_import_cmd(args):
 
 def python_style_checks(args):
     "Check (and fix where possible) copyrights, eclipse formatting, and spotbugs"
+    python_run_mx_filetests(args)
     python_checkcopyrights(["--fix"] if "--fix" in args else [])
     if not os.environ.get("ECLIPSE_EXE"):
         find_eclipse()
@@ -1399,6 +1400,13 @@ def python_checkcopyrights(args):
     _python_checkpatchfiles()
 
 
+def python_run_mx_filetests(args):
+    for test in glob.glob(os.path.join(os.path.dirname(__file__), "test_*.py")):
+        if not test.endswith("data.py"):
+            mx.log(test)
+            mx.run([sys.executable, test, "-v"])
+
+
 def _python_checkpatchfiles():
     listfilename = tempfile.mktemp()
     # additionally, we want to check if the packages we are patching all have a permissive license

mx.graalpython/mx_graalpython_python_benchmarks.py

@@ -51,6 +51,10 @@
 from os.path import join, abspath, exists
 
 
+SUITE = None
+python_vm_registry = None
+
+
 class PyPerfJsonRule(mx_benchmark.Rule):
     """Parses a JSON file produced by PyPerf and creates a measurement result."""
 
@@ -59,8 +63,6 @@ def __init__(self, filename: str, suiteName: str):
         self.suiteName = suiteName
 
     def parse(self, text: str) -> dict:
-        import statistics
-
         r = []
         with open(self._prepend_working_dir(self.filename)) as fp:
             js = json.load(fp)
@@ -188,8 +190,6 @@ def __init__(self, filename: str, suiteName: str):
         self.suiteName = suiteName
 
     def parse(self, text: str) -> dict:
-        import statistics
-
         r = []
         with open(self._prepend_working_dir(self.filename)) as fp:
             js = json.load(fp)
@@ -543,7 +543,8 @@ def _vmRun(self, vm, workdir, command, benchmarks, bmSuiteArgs):
 def register_python_benchmarks():
     global python_vm_registry, SUITE
 
-    from mx_graalpython_benchmark import python_vm_registry
+    from mx_graalpython_benchmark import python_vm_registry as vm_registry
+    python_vm_registry = vm_registry
 
     SUITE = mx.suite("graalpython")