From c7d50475ecf53e8c65d875710c8a97be7dd11bd9 Mon Sep 17 00:00:00 2001 From: Klement Sekera Date: Fri, 14 Apr 2023 17:43:35 +0200 Subject: [PATCH] tests: fix parallel runs skipping some tests Fix corner case when a test would be skipped if it was not possible to start it due to insufficient cpus available in the middle of the loop. Type: fix Change-Id: Ie4580685ff55688375d649d7009131d9fe1e4f33 Signed-off-by: Klement Sekera --- test/run_tests.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/test/run_tests.py b/test/run_tests.py index 3bbf1bc3153..2aa7b028ffc 100644 --- a/test/run_tests.py +++ b/test/run_tests.py @@ -430,7 +430,7 @@ def run_forked(testcase_suites): stop_run = False try: - while wrapped_testcase_suites: + while wrapped_testcase_suites or testcase_suites: finished_testcase_suites = set() for wrapped_testcase_suite in wrapped_testcase_suites: while wrapped_testcase_suite.result_parent_end.poll(): @@ -551,14 +551,16 @@ def run_forked(testcase_suites): while testcase_suites: results.append(TestResult(testcase_suites.pop(0))) elif testcase_suites: - a_suite = testcase_suites.pop(0) + a_suite = testcase_suites[0] while a_suite and a_suite.is_tagged_run_solo: + testcase_suites.pop(0) solo_testcase_suites.append(a_suite) if testcase_suites: - a_suite = testcase_suites.pop(0) + a_suite = testcase_suites[0] else: a_suite = None if a_suite and can_run_suite(a_suite): + testcase_suites.pop(0) run_suite(a_suite) if solo_testcase_suites and tests_running == 0: a_suite = solo_testcase_suites.pop(0) -- 2.16.6