From 1028dd3301ed73d8d213ed1c6c38e8e09acd7913 Mon Sep 17 00:00:00 2001 From: Nerixyz Date: Sun, 24 Nov 2024 22:12:59 +0100 Subject: [PATCH 1/2] fix: loosen requirement for tight timing --- tests/src/OnceFlag.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/src/OnceFlag.cpp b/tests/src/OnceFlag.cpp index 0b0dded299b..3f93b48e3fe 100644 --- a/tests/src/OnceFlag.cpp +++ b/tests/src/OnceFlag.cpp @@ -48,7 +48,7 @@ TEST(OnceFlag, waitFor) ASSERT_TRUE(stoppedFlag.waitFor(std::chrono::milliseconds{200})); auto stop = std::chrono::system_clock::now(); - ASSERT_LT(stop - start, std::chrono::milliseconds{150}); + ASSERT_LT(stop - start, std::chrono::milliseconds{200}); start = std::chrono::system_clock::now(); ASSERT_TRUE(stoppedFlag.waitFor(std::chrono::milliseconds{1000})); From b0c9d8f413ac128b5787ee93a32bf3d7e4c731b9 Mon Sep 17 00:00:00 2001 From: Nerixyz Date: Sun, 24 Nov 2024 22:16:38 +0100 Subject: [PATCH 2/2] changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fcb5ce55d69..373c4925e20 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -135,7 +135,7 @@ - Dev: Unified parsing of historic and live IRC messages. (#5678) - Dev: 7TV's `entitlement.reset` is now explicitly ignored. (#5685) - Dev: Qt 6.8 and later now default to the GDI fontengine. (#5710) -- Dev: Moved to condition variables when shutting down worker threads. (#5721) +- Dev: Moved to condition variables when shutting down worker threads. (#5721, #5733) ## 2.5.1