Stabilize timing-sensitive tests

Author: 0xeb

tests/server/test_middleware_pipeline.cpp

@@ -6,7 +6,9 @@
 #include <atomic>
 #include <cassert>
 #include <chrono>
+#include <condition_variable>
 #include <iostream>
+#include <mutex>
 #include <thread>
 #include <vector>
 
@@ -272,6 +274,8 @@ void test_ping_middleware()
 
     std::shared_ptr<ServerSession> session;
     std::atomic<int> ping_count{0};
+    std::condition_variable ping_cv;
+    std::mutex ping_mutex;
 
     session = std::make_shared<ServerSession>(
         "session_ping",
@@ -280,6 +284,7 @@ void test_ping_middleware()
             if (ServerSession::is_request(msg) && msg.value("method", "") == "ping")
             {
                 ping_count.fetch_add(1);
+                ping_cv.notify_one();
                 Json response = {
                     {"jsonrpc", "2.0"}, {"id", msg.at("id")}, {"result", Json::object()}};
                 session->handle_response(response);
@@ -295,9 +300,10 @@ void test_ping_middleware()
 
     pipeline.execute(ctx, [](const MiddlewareContext&) { return Json{{"tools", Json::array()}}; });
 
-    std::this_thread::sleep_for(std::chrono::milliseconds(50));
-
-    assert(ping_count.load() > 0);
+    std::unique_lock<std::mutex> lock(ping_mutex);
+    bool pinged = ping_cv.wait_for(lock, std::chrono::milliseconds(500),
+                                   [&]() { return ping_count.load() > 0; });
+    assert(pinged);
 
     std::cout << "PASSED\n";
 }

tests/tools/test_tool_timeout.cpp

@@ -13,14 +13,21 @@ using namespace fastmcpp;
 using namespace fastmcpp::tools;
 using namespace std::chrono_literals;
 
+static void sleep_for_at_least(std::chrono::milliseconds duration)
+{
+    auto deadline = std::chrono::steady_clock::now() + duration;
+    while (std::chrono::steady_clock::now() < deadline)
+        std::this_thread::sleep_for(1ms);
+}
+
 void test_tool_timeout_triggers()
 {
     std::cout << "  test_tool_timeout_triggers... " << std::flush;
 
     Tool slow_tool("slow", Json::object(), Json::object(),
                    [](const Json&) -> Json
                    {
-                       std::this_thread::sleep_for(50ms);
+                       sleep_for_at_least(50ms);
                        return Json{{"ok", true}};
                    });
 
@@ -47,7 +54,7 @@ void test_tool_timeout_disabled()
     Tool slow_tool("slow_no_timeout", Json::object(), Json::object(),
                    [](const Json&) -> Json
                    {
-                       std::this_thread::sleep_for(30ms);
+                       sleep_for_at_least(30ms);
                        return Json{{"ok", true}};
                    });
 
@@ -65,7 +72,7 @@ void test_manager_timeout_toggle()
     Tool slow_tool("slow_manager", Json::object(), Json::object(),
                    [](const Json&) -> Json
                    {
-                       std::this_thread::sleep_for(40ms);
+                       sleep_for_at_least(40ms);
                        return Json{{"ok", true}};
                    });