From 6c3e8482f7b4e3b307bb42afbb85fd8771da86b8 Mon Sep 17 00:00:00 2001 From: Jiwoo Park Date: Sat, 10 Aug 2024 20:19:59 +0900 Subject: [PATCH] Fix KeepAliveTest.SSLClientReconnectionPost (#1895) --- test/test.cc | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/test/test.cc b/test/test.cc index 6cb05bc..33ef30b 100644 --- a/test/test.cc +++ b/test/test.cc @@ -5167,8 +5167,14 @@ TEST(KeepAliveTest, SSLClientReconnectionPost) { res.set_content("Hello World!", "text/plain"); }); - auto f = std::async(std::launch::async, [&svr] { svr.listen(HOST, PORT); }); - std::this_thread::sleep_for(std::chrono::milliseconds(200)); + auto listen_thread = std::thread([&svr] { svr.listen(HOST, PORT); }); + auto se = detail::scope_exit([&] { + svr.stop(); + listen_thread.join(); + ASSERT_FALSE(svr.is_running()); + }); + + svr.wait_until_ready(); SSLClient cli(HOST, PORT); cli.enable_server_certificate_verification(false); @@ -5206,9 +5212,6 @@ TEST(KeepAliveTest, SSLClientReconnectionPost) { "text/plain"); ASSERT_TRUE(result); EXPECT_EQ(200, result->status); - - svr.stop(); - f.wait(); } #endif