test: make completion-gating probe fail on regression and pod names unique

Author: lesnik512

tests/integration/conftest.py

@@ -12,6 +12,7 @@
 from collections.abc import Callable, Iterator
 from dataclasses import dataclass
 from pathlib import Path
+from uuid import uuid4
 
 import pytest
 
@@ -56,7 +57,6 @@ def run_pod(tmp_path: Path) -> Iterator[Callable[..., PodRun]]:
     case the script's own EXIT trap did not fire (timeout kill or early crash).
     """
     created: list[str] = []
-    counter = 0
 
     def _run(
         compose: dict,
@@ -66,9 +66,7 @@ def _run(
         project_dir: "str | Path | None" = None,
         timeout: int = 180,
     ) -> PodRun:
-        nonlocal counter
-        counter += 1
-        pod = f"c2p-it-{counter}"
+        pod = f"c2p-it-{uuid4().hex[:8]}"
         created.append(pod)
         options = EmitOptions(
             target=target,

tests/integration/test_completion_gating.py

@@ -1,23 +1,34 @@
-"""service_completed_successfully ordering: a one-shot must finish before the target."""
+"""service_completed_successfully: the target observably requires the one-shot's output.
+
+The one-shot sleeps, then writes a flag to a shared bind mount; the target reads it.
+If completion-gating regressed (one-shot backgrounded instead of run blocking), the
+target would run during the sleep, cat a missing file, exit non-zero, and fail the
+script under `set -e` -- so exit 0 + the flag content genuinely proves ordering.
+"""
 
 from collections.abc import Callable
+from pathlib import Path
 
 from tests.integration.conftest import PodRun
 
 
-def test_completion_gating_orders_one_shot(run_pod: Callable[..., PodRun]) -> None:
+def test_completion_gating_orders_one_shot(run_pod: Callable[..., PodRun], tmp_path: Path) -> None:
+    (tmp_path / "shared").mkdir()
     compose = {
         "services": {
-            "init": {"image": "busybox:1.36", "command": ["sh", "-c", "exit 0"]},
+            "init": {
+                "image": "busybox:1.36",
+                "volumes": ["./shared:/shared"],
+                "command": ["sh", "-c", "sleep 2; echo done > /shared/flag"],
+            },
             "app": {
                 "image": "busybox:1.36",
+                "volumes": ["./shared:/shared"],
                 "depends_on": {"init": {"condition": "service_completed_successfully"}},
-                "command": ["echo", "ready"],
+                "command": ["sh", "-c", "cat /shared/flag"],
             },
         },
     }
-    run = run_pod(compose, target="app")
-    # The one-shot runs blocking (`podman run --rm`) before the target; under
-    # `set -e` a non-zero init would abort the script. Exit 0 + "ready" proves order.
+    run = run_pod(compose, target="app", project_dir=tmp_path)
     assert run.returncode == 0, run.stderr
-    assert "ready" in run.stdout
+    assert "done" in run.stdout