From 6c9d3eb1f154f56b57be579d1a1c7bec91110b1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Mon, 20 Jun 2022 11:40:14 -0400
Subject: [PATCH] scheduler: fix task cancelling
This fix testInviteFromMessageAfterRemoved (hasHandler was
not correct in checkConversationsEvents because the task was not
cancelled anymore).
Fix ut_scheduler's build
Change-Id: I4dbf3b31180c43fb7fa11061f3ffacb492d925c3
---
src/scheduled_executor.h | 1 +
test/unitTest/scheduler.cpp | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/scheduled_executor.h b/src/scheduled_executor.h
index 1ff7d6d5b9..73162149f5 100644
--- a/src/scheduled_executor.h
+++ b/src/scheduled_executor.h
@@ -148,6 +148,7 @@ public:
}
if (not cont) {
+ cancel_.store(true);
job_.reset();
}
diff --git a/test/unitTest/scheduler.cpp b/test/unitTest/scheduler.cpp
index 35d6a0460b..760563b5f8 100644
--- a/test/unitTest/scheduler.cpp
+++ b/test/unitTest/scheduler.cpp
@@ -46,7 +46,7 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(SchedulerTest, SchedulerTest::name());
void
SchedulerTest::schedulerTest()
{
- jami::ScheduledExecutor executor;
+ jami::ScheduledExecutor executor("test");
constexpr unsigned N = 1024;
std::mutex mtx;
--
GitLab