GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-12 06:38:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix deadlocks in job tests

Browse Source 
Should fix them, but let's see...
This commit is contained in:
tamasmeszaros 2023-10-09 14:03:40 +02:00
parent d1156ccefe
commit e74f1bf5ab
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/slic3rutils/slic3r_jobs_tests.cpp
View File

@ -59,6 +59,10 @@ TEMPLATE_LIST_TEST_CASE("State should not be idle while running a job", "[Jobs]"
worker.wait_for_idle(); worker.wait_for_idle();
// To avoid stalling the job, in case the wait_for_idle is called before
// the job goes into blocking wait
worker.process_events();
REQUIRE(worker.is_idle()); REQUIRE(worker.is_idle());
} }
@ -75,12 +79,13 @@ TEMPLATE_LIST_TEST_CASE("Status messages should be received by the main thread d
}); });
worker.wait_for_idle(); worker.wait_for_idle();
worker.process_events();
REQUIRE(pri->pr == 100); REQUIRE(pri->pr == 100);
REQUIRE(pri->statustxt == "Running"); REQUIRE(pri->statustxt == "Running");
} }
TEMPLATE_LIST_TEST_CASE("Cancellation should be recognized be the worker", "[Jobs]", TestClasses) { TEMPLATE_LIST_TEST_CASE("Cancellation should be recognized by the worker", "[Jobs]", TestClasses) {
using namespace Slic3r; using namespace Slic3r;
using namespace Slic3r::GUI; using namespace Slic3r::GUI;
@ -93,7 +98,8 @@ TEMPLATE_LIST_TEST_CASE("Cancellation should be recognized be the worker", "[Job
for (int s = 0; s <= 100; ++s) { for (int s = 0; s <= 100; ++s) {
std::this_thread::sleep_for(std::chrono::milliseconds(10)); std::this_thread::sleep_for(std::chrono::milliseconds(10));
ctl.update_status(s, "Running"); ctl.update_status(s, "Running");
if (ctl.was_canceled()) break; if (ctl.was_canceled())
break;
} }
}, },
[](bool cancelled, std::exception_ptr &) { // finalize [](bool cancelled, std::exception_ptr &) { // finalize
@ -104,6 +110,7 @@ TEMPLATE_LIST_TEST_CASE("Cancellation should be recognized be the worker", "[Job
worker.cancel(); worker.cancel();
worker.wait_for_current_job(); worker.wait_for_current_job();
worker.process_events();
REQUIRE(pri->pr != 100); REQUIRE(pri->pr != 100);
} }
@ -141,6 +148,7 @@ TEMPLATE_LIST_TEST_CASE("cancel_all should remove all pending jobs", "[Jobs]", T
// during the first job's execution. // during the first job's execution.
std::this_thread::sleep_for(std::chrono::milliseconds(500)); std::this_thread::sleep_for(std::chrono::milliseconds(500));
worker.cancel_all(); worker.cancel_all();
worker.process_events();
REQUIRE(jobres[0] == true); REQUIRE(jobres[0] == true);
REQUIRE(jobres[1] == false); REQUIRE(jobres[1] == false);
@ -169,5 +177,7 @@ TEMPLATE_LIST_TEST_CASE("Exception should be properly forwarded to finalize()",
}); });
worker.wait_for_idle(); worker.wait_for_idle();
worker.process_events();
REQUIRE(worker.is_idle()); REQUIRE(worker.is_idle());
} }