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>
This commit is contained in:
Tobias KaupatandClaude Sonnet 5.5 committed 2026-10-20 10:06:04 +02:00
1 parent cb35fb296d
commit 87f772099d
1 file changed
+23 -13
+23 -13
View File
@@ -8,7 +8,10 @@ containers of other images or of the compat suite (a parallel run, a compose sta
alone. alone.
Run with `task test:structure`. 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 from __future__ import annotations
@@ -24,6 +27,7 @@ import docker
from helpers import raise_interrupt from helpers import raise_interrupt
CONFIG = Path(__file__).with_name("structure.yml") CONFIG = Path(__file__).with_name("structure.yml")
TIMEOUT_EXIT = 124
def _containers_of(client: docker.DockerClient, image_id: str) -> list: def _containers_of(client: docker.DockerClient, image_id: str) -> list:
@@ -42,18 +46,24 @@ def main() -> int:
image_id = client.images.get(image).id image_id = client.images.get(image).id
before = {c.id for c in _containers_of(client, image_id)} before = {c.id for c in _containers_of(client, image_id)}
try: try:
return subprocess.run( timeout = float(os.environ.get("CST_TIMEOUT", "300"))
[ try:
"container-structure-test", return subprocess.run(
"test", [
"--save", "container-structure-test",
"--image", "test",
image, "--save",
"--config", "--image",
str(CONFIG), image,
], "--config",
check=False, os.environ.get("CST_CONFIG", str(CONFIG)),
).returncode ],
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: finally:
signal.signal(signal.SIGINT, signal.SIG_IGN) signal.signal(signal.SIGINT, signal.SIG_IGN)
for container in _containers_of(client, image_id): for container in _containers_of(client, image_id):