The max_tasks_per_child init may not be available depending on the Python version. Also fix abort to skip exclusive tests.

Author: grafikrobot

test/test_all.py

@@ -116,14 +116,14 @@ def run_tests(critical_tests, other_tests, exclusive_tests):
     cancelled = False
     max_workers = 1 if "--not-parallel" in sys.argv else None
 
-    max_tasks_per_child = None
+    exc_args = {}
     if (
         "max_tasks_per_child"
         in inspect.signature(concurrent.futures.ProcessPoolExecutor).parameters.keys()
     ):
         # Limit to 1-to-1 processing to allow for timeout canceling at the
         # process level.
-        max_tasks_per_child = 1
+        exc_args["max_tasks_per_child"] = 1
 
     def handler(sig, frame):
         cancelled = True
@@ -139,14 +139,14 @@ def handler(sig, frame):
     start_ts = time.perf_counter()
 
     try:
-        executor = concurrent.futures.ProcessPoolExecutor(
-            max_workers=max_workers,
-            max_tasks_per_child=max_tasks_per_child)
-        execute_tests(executor, all_tests, max_test_name_len)
-        executor = concurrent.futures.ProcessPoolExecutor(
-            max_workers=1,
-            max_tasks_per_child=max_tasks_per_child)
-        execute_tests(executor, exclusive_tests, max_test_name_len)
+        if not cancelled:
+            executor = concurrent.futures.ProcessPoolExecutor(
+                max_workers=max_workers, **exc_args)
+            execute_tests(executor, all_tests, max_test_name_len)
+        if not cancelled:
+            executor = concurrent.futures.ProcessPoolExecutor(
+                max_workers=1, **exc_args)
+            execute_tests(executor, exclusive_tests, max_test_name_len)
     except concurrent.futures.process.BrokenProcessPool:
         # It could be us who broke the pool by terminating its threads
         if not cancelled: