cc core/server/http: refactor http graceful shutdown test

commit_hash:539953cf62bf481f59ac46e5fda1e09ecc69da98

Author: lexeyo

.mapping.json

@@ -805,6 +805,7 @@
   "core/functional_tests/early_monitor_port_open/tests/conftest.py":"taxi/uservices/userver/core/functional_tests/early_monitor_port_open/tests/conftest.py",
   "core/functional_tests/early_monitor_port_open/tests/test_boot.py":"taxi/uservices/userver/core/functional_tests/early_monitor_port_open/tests/test_boot.py",
   "core/functional_tests/graceful_shutdown/CMakeLists.txt":"taxi/uservices/userver/core/functional_tests/graceful_shutdown/CMakeLists.txt",
+  "core/functional_tests/graceful_shutdown/delaying_handler.hpp":"taxi/uservices/userver/core/functional_tests/graceful_shutdown/delaying_handler.hpp",
   "core/functional_tests/graceful_shutdown/main.cpp":"taxi/uservices/userver/core/functional_tests/graceful_shutdown/main.cpp",
   "core/functional_tests/graceful_shutdown/static_config.yaml":"taxi/uservices/userver/core/functional_tests/graceful_shutdown/static_config.yaml",
   "core/functional_tests/graceful_shutdown/tests/conftest.py":"taxi/uservices/userver/core/functional_tests/graceful_shutdown/tests/conftest.py",

core/functional_tests/graceful_shutdown/delaying_handler.hpp

@@ -0,0 +1,33 @@
+#pragma once
+
+#include <userver/engine/sleep.hpp>
+#include <userver/server/handlers/http_handler_base.hpp>
+#include <userver/utils/string_to_duration.hpp>
+
+USERVER_NAMESPACE_BEGIN
+
+namespace server::handlers::testing {
+
+class DelayingServerHandler final : public server::handlers::HttpHandlerBase {
+public:
+    static constexpr std::string_view kName = "handler-delaying";
+
+    DelayingServerHandler(const components::ComponentConfig& config, const components::ComponentContext& context)
+        : HttpHandlerBase(config, context)
+    {}
+
+    std::string HandleRequestThrow(const server::http::HttpRequest& request, server::request::RequestContext&)
+        const override {
+        const auto& delay_arg = request.GetArg("delay");
+        const auto delay = !delay_arg.empty() ? utils::StringToDuration(delay_arg) : std::chrono::milliseconds::zero();
+        if (delay > std::chrono::milliseconds::zero()) {
+            LOG_INFO() << "Delaying response for " << delay << " ms";
+            engine::InterruptibleSleepFor(delay);
+        }
+        return "OK";
+    }
+};
+
+}  // namespace server::handlers::testing
+
+USERVER_NAMESPACE_END

core/functional_tests/graceful_shutdown/main.cpp

@@ -1,3 +1,5 @@
+#include "delaying_handler.hpp"
+
 #include <userver/clients/dns/component.hpp>
 #include <userver/clients/http/component_list.hpp>
 #include <userver/components/minimal_server_component_list.hpp>
@@ -18,6 +20,6 @@ int main(int argc, char* argv[]) {
             .Append<server::handlers::TestsControl>()
             .Append<components::TestsuiteSupport>()
             .Append<server::handlers::Ping>()
-            .Append<server::handlers::LogLevel>();
+            .Append<server::handlers::testing::DelayingServerHandler>();
     return utils::DaemonMain(argc, argv, component_list);
 }

core/functional_tests/graceful_shutdown/static_config.yaml

@@ -60,10 +60,9 @@ components_manager:
             task_processor: main-task-processor
             throttling_enabled: false
 
-        handler-log-level:
-            monitor-handler: true
-            path: /log-level/{level}
+        handler-delaying:
             method: GET
+            path: /test
             task_processor: main-task-processor
 
         tests-control:

core/functional_tests/graceful_shutdown/tests/test_graceful_shutdown.py

@@ -2,13 +2,13 @@
 from signal import SIGTERM
 
 import pytest
+import pytest_userver.utils.sync as sync
 
 
 @pytest.mark.uservice_oneshot
 async def test_graceful_shutdown_timer_and_header(
     service_daemon_instance,
     service_client,
-    monitor_client,
     dynamic_config,
 ):
     params = [
@@ -25,25 +25,24 @@ async def test_graceful_shutdown_timer_and_header(
         dynamic_config.set_values({'GRACEFUL_SHUTDOWN_HEADERS': {'enabled': headers_enabled, 'headers': headers}})
         await service_client.update_server_state()
 
-        response = await monitor_client.get('/log-level/')
+        response = await service_client.get('/test')
         assert response.status == 200
         for header, _ in headers.items():
             assert response.headers.get(header) is None
 
     service_daemon_instance.process.send_signal(SIGTERM)
 
-    status = 200
-    while status == 200:
-        await asyncio.sleep(0.1)
+    async def is_failing():
         response = await service_client.get('/ping')
-        status = response.status
-    assert status == 500
+        return response.status == 500
+
+    await sync.wait(is_failing, relax_period_seconds=0.1)
 
     for headers_enabled, headers in params:
         dynamic_config.set_values({'GRACEFUL_SHUTDOWN_HEADERS': {'enabled': headers_enabled, 'headers': headers}})
         await service_client.update_server_state()
 
-        response = await monitor_client.get('/log-level/')
+        response = await service_client.get('/test')
         assert response.status == 200
         if headers_enabled:
             for header, values in headers.items():