From 87f772099d160aa889ce89df2aa30fc17de8e825 Mon Sep 17 00:00:00 2001
From: Tobias Kaupat <tobias.kaupat@lobaro.de>
Date: Tue, 20 Oct 2026 10:06:04 +0200
Subject: [PATCH] fix: hard timeout for container-structure-test

CST_TIMEOUT (default 300 s) kills a hanging run; existing cleanup removes the
containers; exit code 124 with a clear message.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
---
 tests/structure.py | 36 +++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/tests/structure.py b/tests/structure.py
index 2b55aa1..7f1f3a1 100644
--- a/tests/structure.py
+++ b/tests/structure.py
@@ -8,7 +8,10 @@ containers of other images or of the compat suite (a parallel run, a compose sta
 alone.
 Run with `task test:structure`.
 
-Exit code: the one of container-structure-test.
+A run longer than CST_TIMEOUT seconds (default 300) is killed: container-structure-test has
+no timeout of its own and can block forever waiting for a container.
+
+Exit code: the one of container-structure-test; 124 on timeout.
 """
 
 from __future__ import annotations
@@ -24,6 +27,7 @@ import docker
 from helpers import raise_interrupt
 
 CONFIG = Path(__file__).with_name("structure.yml")
+TIMEOUT_EXIT = 124
 
 
 def _containers_of(client: docker.DockerClient, image_id: str) -> list:
@@ -42,18 +46,24 @@ def main() -> int:
     image_id = client.images.get(image).id
     before = {c.id for c in _containers_of(client, image_id)}
     try:
-        return subprocess.run(
-            [
-                "container-structure-test",
-                "test",
-                "--save",
-                "--image",
-                image,
-                "--config",
-                str(CONFIG),
-            ],
-            check=False,
-        ).returncode
+        timeout = float(os.environ.get("CST_TIMEOUT", "300"))
+        try:
+            return subprocess.run(
+                [
+                    "container-structure-test",
+                    "test",
+                    "--save",
+                    "--image",
+                    image,
+                    "--config",
+                    os.environ.get("CST_CONFIG", str(CONFIG)),
+                ],
+                check=False,
+                timeout=timeout,
+            ).returncode
+        except subprocess.TimeoutExpired:
+            print(f"container-structure-test timed out after {timeout:g} s", file=sys.stderr)
+            return TIMEOUT_EXIT
     finally:
         signal.signal(signal.SIGINT, signal.SIG_IGN)
         for container in _containers_of(client, image_id):