* test/unitTest/scheduler.cpp: Reformat via clang-format. Raise timeout from 3 to 30 s to avoid spurious failure on slow machines.
Fixes: <https://git.jami.net/savoirfairelinux/jami-daemon/-/issues/939> --- test/unitTest/scheduler.cpp | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/test/unitTest/scheduler.cpp b/test/unitTest/scheduler.cpp index b851de370..dd43cb87a 100644 --- a/test/unitTest/scheduler.cpp +++ b/test/unitTest/scheduler.cpp @@ -27,9 +27,11 @@ #include "scheduled_executor.h" #include <opendht/rng.h> -namespace jami { namespace test { +namespace jami { +namespace test { -class SchedulerTest : public CppUnit::TestFixture { +class SchedulerTest : public CppUnit::TestFixture +{ public: static std::string name() { return "scheduler"; } @@ -56,10 +58,10 @@ SchedulerTest::schedulerTest() std::atomic_uint64_t taskRun {0}; std::atomic_uint64_t result {0}; - auto task = [&]{ + auto task = [&] { auto rng = dht::crypto::getSeededRandomEngine(); uint64_t sum {0}; - for (uint64_t i=0; i<64 * N; i++) + for (uint64_t i = 0; i < 64 * N; i++) sum += rng(); result += sum; std::lock_guard l(mtx); @@ -68,25 +70,22 @@ SchedulerTest::schedulerTest() }; CPPUNIT_ASSERT(taskRun == 0); - for (unsigned i=0; i<N; i++) + for (unsigned i = 0; i < N; i++) executor.run(task); - CPPUNIT_ASSERT(cv.wait_for(lk, std::chrono::seconds(3), [&]{ - return taskRun == N; - })); + CPPUNIT_ASSERT(cv.wait_for(lk, std::chrono::seconds(30), [&] { return taskRun == N; })); - for (unsigned i=0; i<N; i++) + for (unsigned i = 0; i < N; i++) executor.scheduleIn(task, std::chrono::microseconds(1)); - CPPUNIT_ASSERT(cv.wait_for(lk, std::chrono::seconds(3), [&]{ - return taskRun == 2 * N; - })); + CPPUNIT_ASSERT(cv.wait_for(lk, std::chrono::seconds(30), [&] { return taskRun == 2 * N; })); - for (unsigned i=0; i<N; i++) + for (unsigned i = 0; i < N; i++) executor.scheduleIn(task, std::chrono::microseconds(1)); executor.stop(); } -}} // namespace jami::test +} // namespace test +} // namespace jami RING_TEST_RUNNER(jami::test::SchedulerTest::name()); base-commit: e246fb2e090c9b3de55e2d455eee5a6f05a5b286 -- 2.41.0
