@norskvideo/ctl-test-harness 0.1.27 → 0.1.29

package/package.json

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

package/smoke.js

@@ -187,6 +187,7 @@ export async function runProductSmoke(slug, spec, deps = defaultSmokeDeps) {
     };
     let daemon = null;
     let launched = false;
+    let registered = false;
     let handles = [];
     let journeyError;
     try {
@@ -226,6 +227,7 @@ export async function runProductSmoke(slug, spec, deps = defaultSmokeDeps) {
         if (added.name !== spec.product.name) {
             throw new Error(`product add registered '${added.name}', expected '${spec.product.name}'`);
         }
+        registered = true;
         // Template.
         let templateName;
         if ("name" in spec.template) {
@@ -327,6 +329,15 @@ export async function runProductSmoke(slug, spec, deps = defaultSmokeDeps) {
     }
     if (handles.length)
         await deps.stopSources(handles).catch(() => { });
+    // The daemon reaps its own control-plane containers on shutdown (daemon.ts,
+    // model B), but only on the graceful path -- and cleanupDaemon escalates to
+    // SIGKILL 3s after SIGTERM, which can cut a slow `docker rm` short. Removing
+    // the product here does it while the daemon is calm rather than racing its
+    // own teardown. Best-effort: a throw here would mask the journey's own error,
+    // and a killed job never reaches this line -- the workflow's reap is what
+    // heals a runner already holding the port.
+    if (registered)
+        await cli(["product", "remove", spec.product.name]).catch(() => { });
     // cleanupDaemon ends with rmSync(storeDir); Docker's root-owned bind-mount
     // targets make that EACCES on a non-root runner. Expected: the root nuke
     // below is what removes them. Only a store that survives the nuke fails.