opensourcemirror
/
cockpit
mirror of https://github.com/cockpit-project/cockpit.git
1
0
Fork 0
Code Issues Releases Wiki Activity

test: Fix run-tests scheduling with little or no parallelism 

Commit 49a7122df introduced a regression when the number of parallel
jobs was smaller than the cost of a test: These tests would never be
scheduled, and at the end the scheduler failed the "parallel_tests
should be empty" assertion.

Fix that by also scheduling the next parallel test if the number of
running tests is empty. That will cause the costly ones to run serially,
as intended.
This commit is contained in:
Martin Pitt 2022-07-28 14:30:21 +02:00 committed by Martin Pitt
parent a6f84216c9
commit 30d18dee80
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/common/run-tests
View File

@ -441,8 +441,8 @@ def run(opts, image):
def running_cost():
return functools.reduce(lambda cost, test: cost + test.cost, running_tests, 0)
# fill the remaining available job slots with parallel tests
while parallel_tests and running_cost() + parallel_tests[0].cost <= opts.jobs:
# fill the remaining available job slots with parallel tests; run tests with a cost higher than #jobs by themselves
while parallel_tests and (running_cost() + parallel_tests[0].cost <= opts.jobs or len(running_tests) == 0):
test = parallel_tests.pop(0)
logging.debug(f"{len(running_tests)} running tests with total cost {running_cost()}, starting next parallel test {test}")
test.start()