diff options
| author |   Andrew Yourtchenko <ayourtch@gmail.com> | 2021-01-20 14:53:55 +0000 |
|---|---|---|
| committer | Andrew Yourtchenko <ayourtch@gmail.com> | 2021-01-20 20:28:48 +0000 |
| commit | 4d084079cd9ec79578f616c965ca11d5c2e410c3 (patch) | |
| tree | 0f50a23b7120c064fdeb02ee6bf4373064820b8e /test/run_tests.py | |
| parent | 4f411d1191369ed467255414644313933b8efb97 (diff) | |
tests: do not skip solo-run tests if running within a single job and all remaining tests are solo-run
There was a logic error, which results in not running solo tests
if TEST_JOBS=1, and we have finished running the regular test
and the remaining tests are all solo-run. They all get put into
that pile, but the new runners never start.
Solution: check the pile of solo-run jobs unconditionally.
Thanks to Klement Sekera for spotting the issue.
Type: fix
Change-Id: Iaecacbe4de44050cd8d0ff2d524559df99f2bae4
Signed-off-by: Andrew Yourtchenko <ayourtch@gmail.com>
Diffstat (limited to 'test/run_tests.py')
| -rw-r--r-- | test/run_tests.py | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/test/run_tests.py b/test/run_tests.py index 66118ca6f41..d5bdfc838df 100644 --- a/test/run_tests.py +++ b/test/run_tests.py @@ -485,14 +485,13 @@ def run_forked(testcase_suites): wrapped_testcase_suites.add(new_testcase) total_test_runners = total_test_runners + 1 unread_testcases.add(new_testcase) - else: - if solo_testcase_suites and total_test_runners == 0: - a_testcase = solo_testcase_suites.pop(0) - new_testcase = TestCaseWrapper(a_testcase, - manager) - wrapped_testcase_suites.add(new_testcase) - total_test_runners = total_test_runners + 1 - unread_testcases.add(new_testcase) + if solo_testcase_suites and total_test_runners == 0: + a_testcase = solo_testcase_suites.pop(0) + new_testcase = TestCaseWrapper(a_testcase, + manager) + wrapped_testcase_suites.add(new_testcase) + total_test_runners = total_test_runners + 1 + unread_testcases.add(new_testcase) time.sleep(0.1) except Exception: for wrapped_testcase_suite in wrapped_testcase_suites: |