From 3d66da1809651543001d37f2b6cb3a172adc2557 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20Gallou=C3=ABt?= Date: Sat, 28 Mar 2026 14:49:57 +0100 Subject: [PATCH] ci : gracefully shut down the server (#21110) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Adrien Gallouët --- tools/server/tests/utils.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/server/tests/utils.py b/tools/server/tests/utils.py index c6fe11261f..8f62210bcc 100644 --- a/tools/server/tests/utils.py +++ b/tools/server/tests/utils.py @@ -288,7 +288,15 @@ class ServerProcess: server_instances.remove(self) if self.process: print(f"Stopping server with pid={self.process.pid}") - self.process.kill() + self.process.terminate() + try: + self.process.wait(timeout=5) + except subprocess.TimeoutExpired: + print(f"Server pid={self.process.pid} did not terminate in time, killing") + self.process.kill() + self.process.wait(timeout=5) + except Exception as e: + print(f"Error waiting for server: {e}") self.process = None def make_request(