From 453410542a8721bb65b6295a5286524266f3fee8 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 22 Dec 2021 16:47:27 +0100 Subject: [PATCH] Fix deadlock in test, caused by setting jobs to finished before they have been started. --- test/job_manager_test.cc | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/test/job_manager_test.cc b/test/job_manager_test.cc index 1baa5767e..cdd1e2a29 100644 --- a/test/job_manager_test.cc +++ b/test/job_manager_test.cc @@ -123,8 +123,19 @@ BOOST_AUTO_TEST_CASE (job_manager_test2) BOOST_CHECK (i == 5 ? jobs[i]->running() : !jobs[i]->running()); } - for (auto job: jobs) { - job->set_finished_ok(); + /* Set any jobs that are started to be finished, until they're all finished */ + while (true) { + if (std::find_if(jobs.begin(), jobs.end(), [](shared_ptr job) { return !job->finished_ok(); }) == jobs.end()) { + break; + } + + for (auto job: jobs) { + if (job->running()) { + job->set_finished_ok(); + } + } } + + BOOST_REQUIRE (!wait_for_jobs()); } -- 2.30.2