tests/run-tests.py: Accumulate all test results in one list.

dpgeorge · dpgeorge · commit 994ca4b3f7f0 · 2025-05-29T22:38:52.000+10:00
Signed-off-by: Damien George &lt;damien@micropython.org&gt;
diff --git a/tests/run-tests.py b/tests/run-tests.py
@@ -605,9 +605,7 @@ def run_script_on_remote_target(self, args, test_file, is_special):
 def run_tests(pyb, tests, args, result_dir, num_threads=1):
     test_count = ThreadSafeCounter()
     testcase_count = ThreadSafeCounter()
-    passed_tests = ThreadSafeCounter([])
-    failed_tests = ThreadSafeCounter([])
-    skipped_tests = ThreadSafeCounter([])
+    test_results = ThreadSafeCounter([])
 
     skip_tests = set()
     skip_native = False
@@ -896,7 +894,7 @@ def run_one_test(test_file):
 
         if skip_it:
             print("skip ", test_file)
-            skipped_tests.append((test_name, test_file))
+            test_results.append((test_name, test_file, "skip", ""))
             return
 
         # Run the test on the MicroPython target.
@@ -911,7 +909,7 @@ def run_one_test(test_file):
                 # start-up code (eg boot.py) when preparing to run the next test.
                 pyb.read_until(1, b"raw REPL; CTRL-B to exit\r\n")
             print("skip ", test_file)
-            skipped_tests.append((test_name, test_file))
+            test_results.append((test_name, test_file, "skip", ""))
             return
 
         # Look at the output of the test to see if unittest was used.
@@ -994,7 +992,7 @@ def run_one_test(test_file):
         # Print test summary, update counters, and save .exp/.out files if needed.
         if test_passed:
             print("pass ", test_file, extra_info)
-            passed_tests.append((test_name, test_file))
+            test_results.append((test_name, test_file, "pass", ""))
             rm_f(filename_expected)
             rm_f(filename_mupy)
         else:
@@ -1006,7 +1004,7 @@ def run_one_test(test_file):
                 rm_f(filename_expected)  # in case left over from previous failed run
             with open(filename_mupy, "wb") as f:
                 f.write(output_mupy)
-            failed_tests.append((test_name, test_file))
+            test_results.append((test_name, test_file, "fail", ""))
 
         test_count.increment()
 
@@ -1035,9 +1033,10 @@ def run_one_test(test_file):
             print(line)
         sys.exit(1)
 
-    passed_tests = sorted(passed_tests.value)
-    skipped_tests = sorted(skipped_tests.value)
-    failed_tests = sorted(failed_tests.value)
+    test_results = test_results.value
+    passed_tests = list(r for r in test_results if r[2] == "pass")
+    skipped_tests = list(r for r in test_results if r[2] == "skip")
+    failed_tests = list(r for r in test_results if r[2] == "fail")
 
     print(
         "{} tests performed ({} individual testcases)".format(
@@ -1072,12 +1071,8 @@ def to_json(obj):
                 # The arguments passed on the command-line.
                 "args": vars(args),
                 # A list of all results of the form [(test, result, reason), ...].
-                "results": (
-                    list([test[1], "pass", ""] for test in passed_tests)
-                    + list([test[1], "skip", ""] for test in skipped_tests)
-                    + list([test[1], "fail", ""] for test in failed_tests)
-                ),
-                # A list of failed tests.  This is deprecated, one should the results above.
+                "results": list(test[1:] for test in test_results),
+                # A list of failed tests.  This is deprecated, use the "results" above instead.
                 "failed_tests": [test[1] for test in failed_tests],
             },
             f,
