allow parallel execution of test methods in a test class

Author: timfel

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

@@ -52,6 +52,18 @@
 verbose = False
 
 
+import threading
+import _thread
+result_lock = threading.RLock()
+if os.environ.get(b"ENABLE_THREADED_GRAALPYTEST") == b"true":
+    thread_count = os.cpu_count()
+    thread_token = threading.Semaphore(thread_count)
+    print("Running with %d threads" % thread_count)
+else:
+    thread_count = 0
+    thread_token = None
+
+
 def dump_truffle_ast(func):
     try:
         print(__dump_truffle_ast__(func))
@@ -72,7 +84,8 @@ def __init__(self):
 
     def run_safely(self, func, print_immediately=False):
         if verbose:
-            print(u"\n\t\u21B3 ", func.__name__, " ", end="")
+            with result_lock:
+                print(u"\n\t\u21B3 ", func.__name__, " ", end="")
         try:
             func()
         except BaseException as e:
@@ -102,10 +115,19 @@ def run_test(self, func):
             pass
         elif not hasattr(func, "__call__"):
             pass
-        elif self.run_safely(func):
-            self.success()
         else:
-            self.failure()
+            def do_run():
+                r = self.run_safely(func)
+                with result_lock:
+                    self.success() if r else self.failure()
+                if thread_token:
+                    thread_token.release()
+
+            if thread_token:
+                thread_token.acquire()
+                threading.Thread(target=do_run).start()
+            else:
+                do_run()
 
     def success(self):
         self.passed += 1
@@ -318,6 +340,11 @@ def run(self):
                 self.failed += testcase.failed
             if verbose:
                 print()
+        for i in range(thread_count):
+            print("waiting for %d tests to finish" % (thread_count - i))
+            thread_token.acquire() # waits until all threads are exited
+        for i in range(thread_count):
+            thread_token.release()
         print("\n\nRan %d tests (%d passes, %d failures)" % (self.passed + self.failed, self.passed, self.failed))
         for e in self.exceptions:
             print(e)

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

@@ -72,10 +72,14 @@ def working_tests():
     return working_tests
 
 
+class TestAllWorkingTests():
+    pass
+
+
 WORKING_TESTS = working_tests()
 for idx, working_test in enumerate(WORKING_TESTS):
     def make_test_func(working_test):
-        def fun():
+        def fun(self):
             cmd = [sys.executable, "-S", "-m", "unittest"]
             for testpattern in working_test[1]:
                 cmd.extend(["-k", testpattern])
@@ -88,7 +92,7 @@ def fun():
         return fun
 
     test_f = make_test_func(working_test)
-    globals()[test_f.__name__] = test_f
+    setattr(TestAllWorkingTests, test_f.__name__, test_f)
     del test_f