test(docker): pin the content_mismatch_overwritten warning in the for…

…ce-apply gates With scan pinned to --strict, the dedicated `apply --force` step is the writer again — but force-overwriting the all-zeros-baseline fixture now also surfaces the content_mismatch_overwritten warning as a Skipped event, so the old `skipped:0` gates fail. Assert the new contract instead: exactly one skip AND the warning's errorCode present (cargo/golang/maven/nuget×2; composer has no skipped gate). All five suites verified locally against freshly built images. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Mikola Lysenko (mikolalysenko) · Jun 12, 2026 · Jun 11, 2026 · Jun 11, 2026 · Jun 11, 2026 · Jun 11, 2026
commit cb1b0a601467698ced220d91bef46edcc68800d9
diff --git a/crates/socket-patch-cli/tests/docker_e2e_cargo.rs b/crates/socket-patch-cli/tests/docker_e2e_cargo.rs
@@ -228,8 +228,16 @@ grep -q '"failed": 0,' /tmp/apply.out || {{
   cat /tmp/apply.out >&2
   exit 1
 }}
-grep -q '"skipped": 0,' /tmp/apply.out || {{
-  echo "FAIL: apply JSON did not report skipped:0" >&2
+# The --force overwrite of the mismatched baseline surfaces the
+# content_mismatch_overwritten warning as a Skipped event (the
+# mismatch-warn contract) — exactly that one, nothing else skipped.
+grep -q '"skipped": 1,' /tmp/apply.out || {{
+  echo "FAIL: apply JSON did not report skipped:1 (the mismatch-overwrite warning)" >&2
+  cat /tmp/apply.out >&2
+  exit 1
+}}
+grep -q '"errorCode": "content_mismatch_overwritten"' /tmp/apply.out || {{
+  echo "FAIL: apply JSON missing the content_mismatch_overwritten warning event" >&2
   cat /tmp/apply.out >&2
   exit 1
 }}

diff --git a/crates/socket-patch-cli/tests/docker_e2e_golang.rs b/crates/socket-patch-cli/tests/docker_e2e_golang.rs
@@ -209,8 +209,16 @@ grep -qE '^[[:space:]]*"failed": 0,[[:space:]]*$' /tmp/apply.out || {{
   cat /tmp/apply.out >&2
   exit 1
 }}
-grep -qE '^[[:space:]]*"skipped": 0,[[:space:]]*$' /tmp/apply.out || {{
-  echo "FAIL: apply JSON reported a non-zero skipped count" >&2
+# The --force overwrite of the mismatched baseline surfaces the
+# content_mismatch_overwritten warning as a Skipped event (the
+# mismatch-warn contract) — exactly that one, nothing else skipped.
+grep -qE '^[[:space:]]*"skipped": 1,[[:space:]]*$' /tmp/apply.out || {{
+  echo "FAIL: apply JSON did not report skipped:1 (the mismatch-overwrite warning)" >&2
+  cat /tmp/apply.out >&2
+  exit 1
+}}
+grep -q '"errorCode": "content_mismatch_overwritten"' /tmp/apply.out || {{
+  echo "FAIL: apply JSON missing the content_mismatch_overwritten warning event" >&2
   cat /tmp/apply.out >&2
   exit 1
 }}

diff --git a/crates/socket-patch-cli/tests/docker_e2e_maven.rs b/crates/socket-patch-cli/tests/docker_e2e_maven.rs
@@ -235,8 +235,16 @@ grep -q '"failed": 0,' /tmp/apply.out || {{
   cat /tmp/apply.out >&2
   exit 1
 }}
-grep -q '"skipped": 0,' /tmp/apply.out || {{
-  echo "FAIL: apply JSON did not report skipped:0" >&2
+# The --force overwrite of the mismatched baseline surfaces the
+# content_mismatch_overwritten warning as a Skipped event (the
+# mismatch-warn contract) — exactly that one, nothing else skipped.
+grep -q '"skipped": 1,' /tmp/apply.out || {{
+  echo "FAIL: apply JSON did not report skipped:1 (the mismatch-overwrite warning)" >&2
+  cat /tmp/apply.out >&2
+  exit 1
+}}
+grep -q '"errorCode": "content_mismatch_overwritten"' /tmp/apply.out || {{
+  echo "FAIL: apply JSON missing the content_mismatch_overwritten warning event" >&2
   cat /tmp/apply.out >&2
   exit 1
 }}

diff --git a/crates/socket-patch-cli/tests/docker_e2e_nuget.rs b/crates/socket-patch-cli/tests/docker_e2e_nuget.rs
@@ -240,8 +240,16 @@ grep -q '"failed": 0,' /tmp/apply.out || {{
   cat /tmp/apply.out >&2
   exit 1
 }}
-grep -q '"skipped": 0,' /tmp/apply.out || {{
-  echo "FAIL: apply JSON did not report skipped:0" >&2
+# The --force overwrite of the mismatched baseline surfaces the
+# content_mismatch_overwritten warning as a Skipped event (the
+# mismatch-warn contract) — exactly that one, nothing else skipped.
+grep -q '"skipped": 1,' /tmp/apply.out || {{
+  echo "FAIL: apply JSON did not report skipped:1 (the mismatch-overwrite warning)" >&2
+  cat /tmp/apply.out >&2
+  exit 1
+}}
+grep -q '"errorCode": "content_mismatch_overwritten"' /tmp/apply.out || {{
+  echo "FAIL: apply JSON missing the content_mismatch_overwritten warning event" >&2
   cat /tmp/apply.out >&2
   exit 1
 }}
@@ -362,8 +370,16 @@ grep -q '"failed": 0,' /tmp/apply.out || {{
   cat /tmp/apply.out >&2
   exit 1
 }}
-grep -q '"skipped": 0,' /tmp/apply.out || {{
-  echo "FAIL: apply JSON did not report skipped:0" >&2
+# The --force overwrite of the mismatched baseline surfaces the
+# content_mismatch_overwritten warning as a Skipped event (the
+# mismatch-warn contract) — exactly that one, nothing else skipped.
+grep -q '"skipped": 1,' /tmp/apply.out || {{
+  echo "FAIL: apply JSON did not report skipped:1 (the mismatch-overwrite warning)" >&2
+  cat /tmp/apply.out >&2
+  exit 1
+}}
+grep -q '"errorCode": "content_mismatch_overwritten"' /tmp/apply.out || {{
+  echo "FAIL: apply JSON missing the content_mismatch_overwritten warning event" >&2
   cat /tmp/apply.out >&2
   exit 1
 }}