ARCHIVE/clio
1
0
Fork 0
mirror of https://github.com/XRPLF/clio.git synced 2026-04-29 15:37:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: ASAN issues from runSpawnWithTimeout (#2482)

Browse Source
This commit is contained in:
Alex Kremer
2025-08-28 11:47:23 +01:00
committed by GitHub
parent 33c0737933
commit ae15bbd7b5
3 changed files with 5 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
tests/common/util/AsioContextTestFixture.hpp
View File

@@ -113,40 +113,11 @@ struct SyncAsioContextTest : virtual public NoLoggerFixture {
runContext();
}
template <typename F>
void
runSpawnWithTimeout(std::chrono::steady_clock::duration timeout, F&& f, bool allowMockLeak = false)
{
boost::asio::io_context timerCtx;
boost::asio::steady_timer timer{timerCtx, timeout};
util::spawn(timerCtx, [this, &timer](boost::asio::yield_context yield) {
boost::system::error_code errorCode;
timer.async_wait(yield[errorCode]);
ctx_.stop();
EXPECT_TRUE(false) << "Test timed out";
});
std::thread timerThread{[&timerCtx]() { timerCtx.run(); }};
testing::MockFunction<void()> call;
if (allowMockLeak)
testing::Mock::AllowLeak(&call);
util::spawn(ctx_, [&](boost::asio::yield_context yield) {
f(yield);
call.Call();
});
EXPECT_CALL(call, Call());
runContext();
timerCtx.stop();
timerThread.join();
}
void
runContext()
{
ctx_.run();
static constexpr auto kTIMEOUT = std::chrono::seconds{30};
ctx_.run_for(kTIMEOUT);
ctx_.restart();
}

6
tests/unit/util/BlockingCacheTests.cpp
View File

@@ -157,7 +157,7 @@ TEST_P(BlockingCacheWaitTest, WaitForUpdate)
if (GetParam().updateSuccessful)
EXPECT_CALL(mockVerifier, Call(value)).WillOnce(Return(GetParam().verifierAccepts));
runSpawnWithTimeout(std::chrono::seconds{1}, [&](boost::asio::yield_context yield) {
runSpawn([&](boost::asio::yield_context yield) {
auto result = cache->asyncGet(yield, mockUpdater.AsStdFunction(), mockVerifier.AsStdFunction());
if (GetParam().updateSuccessful) {
@@ -244,7 +244,5 @@ TEST_F(BlockingCacheTest, UpdateFromTwoCoroutinesHappensOnlyOnce)
ASSERT_EQ(result.value(), value);
};
runSpawnWithTimeout(std::chrono::seconds{1}, [&](boost::asio::yield_context yield) {
util::spawn(yield, updatingCoroutine);
});
runSpawn([&](boost::asio::yield_context yield) { util::spawn(yield, updatingCoroutine); });
}

2
tests/unit/web/ng/impl/WsConnectionTests.cpp
View File

@@ -397,7 +397,7 @@ TEST_F(WebWsConnectionTests, CloseCalledFromMultipleSubCoroutines)
testing::StrictMock<testing::MockFunction<void()>> closeCalled;
EXPECT_CALL(closeCalled, Call).Times(2);
runSpawnWithTimeout(std::chrono::seconds{1}, [&](boost::asio::yield_context yield) {
runSpawn([&](boost::asio::yield_context yield) {
auto wsConnection = acceptConnection(yield);
util::CoroutineGroup coroutines{yield};
for ([[maybe_unused]] int const i : std::ranges::iota_view{0, 2}) {