@norskvideo/ctl-test-harness 0.1.36 → 0.1.37

package/demo/dev-loop.js

@@ -199,7 +199,18 @@ export async function devLoopDown(product, deps = defaultDemoDeps(process.cwd())
     }
     if (state.devPid !== undefined)
         deps.killPid?.(state.devPid);
-    deps.nukeStoreAsRoot(state.storeDir);
+    // Never let the nuke strand the state record: it sits one line before
+    // state.remove, and the containment guard throws for a store outside THIS
+    // process's temp base -- which is a cross-process fact (the `up` shell's
+    // NORSK_CTL_TEST_TMP need not be the `down` shell's), not a bug in the run
+    // being torn down. Refusing to delete it is right; failing to forget it
+    // means `down` breaks identically on every retry.
+    try {
+        deps.nukeStoreAsRoot(state.storeDir);
+    }
+    catch (e) {
+        deps.log(`nuke skipped: ${e instanceof Error ? e.message : String(e)}`);
+    }
     deps.state.remove(product, "dev-loop");
     deps.log(`${product} dev-loop torn down (the workdir ${state.workdir ?? ""} is untouched)`);
 }

package/demo/run.js

@@ -733,8 +733,19 @@ export async function demoDown(product, deps = defaultDemoDeps(process.cwd())) {
         deps.docker(["rm", "-f", name]);
     if (state.devPid !== undefined)
         deps.killPid?.(state.devPid);
-    if (state.daemon !== "reuse")
-        deps.nukeStoreAsRoot(state.storeDir);
+    // Never let the nuke strand the state record: it sits one line before
+    // state.remove, and the containment guard throws for a store outside THIS
+    // process's temp base -- which is a cross-process fact (the `up` shell's
+    // NORSK_CTL_TEST_TMP need not be the `down` shell's), not a bug in the run
+    // being torn down. Refusing to delete it is right; failing to forget it
+    // means `down` breaks identically on every retry.
+    try {
+        if (state.daemon !== "reuse")
+            deps.nukeStoreAsRoot(state.storeDir);
+    }
+    catch (e) {
+        deps.log(`nuke skipped: ${e instanceof Error ? e.message : String(e)}`);
+    }
     deps.state.remove(product);
     deps.log(`${product} demo torn down${state.daemon === "reuse" ? " (your daemon and its registration are untouched)" : ""}`);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@norskvideo/ctl-test-harness",
-  "version": "0.1.36",
+  "version": "0.1.37",
   "type": "module",
   "exports": {
     ".": {

package/root-nuke.d.ts

@@ -27,9 +27,14 @@ export declare function assertNukeTarget(target: string, allowedBase: string): v
  *     directory called `x; rm -rf /base` would otherwise wipe every sibling --
  *     including a live sibling run -- from inside a root container. */
 export declare function nukeArgv(target: string): string[];
-/** Remove `target` as root. Returns whether the nuke actually ran: `spawnSync`
- *  reports a missing docker in its RESULT rather than throwing, and a caller
- *  that retries a doomed spawn forever (silently) is the failure mode to avoid.
+/** Remove `target` as root. Returns whether the nuke actually SUCCEEDED.
+ *
+ *  Both halves matter. `spawnSync` reports a missing docker in its RESULT
+ *  rather than throwing, and a docker that is present but failing -- daemon
+ *  stopped, image unpullable, mount refused -- reports only a non-zero status
+ *  with no `error` at all. Reading `error` alone calls that a success, so a
+ *  caller latching on the return value never latches and re-spawns a doomed
+ *  60-second docker on every attempt, forever and silently.
  *  Throws only for an unsafe target -- see {@link assertNukeTarget}. */
 export declare function nukePathAsRoot(target: string, allowedBase: string, spawn?: NukeSpawn): boolean;
 export interface OwnerScanDeps {

package/root-nuke.js

@@ -72,14 +72,21 @@ export function nukeArgv(target) {
         basename(target),
     ];
 }
-/** Remove `target` as root. Returns whether the nuke actually ran: `spawnSync`
- *  reports a missing docker in its RESULT rather than throwing, and a caller
- *  that retries a doomed spawn forever (silently) is the failure mode to avoid.
+/** Remove `target` as root. Returns whether the nuke actually SUCCEEDED.
+ *
+ *  Both halves matter. `spawnSync` reports a missing docker in its RESULT
+ *  rather than throwing, and a docker that is present but failing -- daemon
+ *  stopped, image unpullable, mount refused -- reports only a non-zero status
+ *  with no `error` at all. Reading `error` alone calls that a success, so a
+ *  caller latching on the return value never latches and re-spawns a doomed
+ *  60-second docker on every attempt, forever and silently.
  *  Throws only for an unsafe target -- see {@link assertNukeTarget}. */
 export function nukePathAsRoot(target, allowedBase, spawn = spawnSync) {
     assertNukeTarget(target, allowedBase);
     const r = spawn("docker", nukeArgv(target), { timeout: NUKE_TIMEOUT_MS });
-    return !r?.error;
+    if (r?.error)
+        return false;
+    return r?.status === 0 || r?.status === undefined;
 }
 /** Paths under `dir` owned by a uid that is not `selfUid`, with the owning uid.
  *