3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix failing test for new ui jobs

Browse source
This commit is contained in:
tamasmeszaros 2022-01-18 10:54:37 +01:00
parent d09a0cea83
commit 960158b79f
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
tests/slic3rutils/slic3r_jobs_tests.cpp
View file

@ -95,26 +95,28 @@ TEST_CASE("cancel_all should remove all pending jobs", "[Jobs]") {
auto pri = std::make_shared<Progress>(); auto pri = std::make_shared<Progress>();
BoostThreadWorker worker{pri}; BoostThreadWorker worker{pri};
std::array<bool, 4> jobres = {false}; std::array<bool, 4> jobres = {false, false, false, false};
queue_job(worker, [&jobres](Job::Ctl &) { queue_job(worker, [&jobres](Job::Ctl &) {
jobres[0] = true; jobres[0] = true;
std::this_thread::sleep_for(std::chrono::milliseconds(1)); // FIXME: the long wait time is needed to prevent fail in MSVC
// where the sleep_for function is behaving stupidly.
// see https://developercommunity.visualstudio.com/t/bogus-stdthis-threadsleep-for-implementation/58530
std::this_thread::sleep_for(std::chrono::seconds(1));
}); });
queue_job(worker, [&jobres](Job::Ctl &) { queue_job(worker, [&jobres](Job::Ctl &) {
jobres[1] = true; jobres[1] = true;
std::this_thread::sleep_for(std::chrono::milliseconds(1));
}); });
queue_job(worker, [&jobres](Job::Ctl &) { queue_job(worker, [&jobres](Job::Ctl &) {
jobres[2] = true; jobres[2] = true;
std::this_thread::sleep_for(std::chrono::milliseconds(1));
}); });
queue_job(worker, [&jobres](Job::Ctl &) { queue_job(worker, [&jobres](Job::Ctl &) {
jobres[3] = true; jobres[3] = true;
std::this_thread::sleep_for(std::chrono::milliseconds(1));
}); });
std::this_thread::sleep_for(std::chrono::microseconds(500)); // wait until the first job's half time to be sure, the cancel is made
// during the first job's execution.
std::this_thread::sleep_for(std::chrono::milliseconds(500));
worker.cancel_all(); worker.cancel_all();
REQUIRE(jobres[0] == true); REQUIRE(jobres[0] == true);