@norskvideo/ctl-test-harness 0.1.31 → 0.1.32

package/package.json

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

package/smoke.d.ts

@@ -137,6 +137,10 @@ export interface SmokeDeps {
     ensureNetwork(): ReturnType<typeof ensureRunnerOnNetwork>;
     supportsNoPublish(): Promise<boolean>;
     containerUser(): string | undefined;
+    /** Diagnostic dump for a satisfied-phase timeout, taken while the instance
+     *  is still up. Optional so an existing custom-deps consumer keeps working;
+     *  the default reads every container carrying the instance's label. */
+    diagnose?(instanceId: string): string;
     log(line: string): void;
 }
 /** Per-slug port band, above the product integration harnesses' own bands:

package/smoke.js

@@ -20,6 +20,7 @@
 import { spawnSync } from "node:child_process";
 import { existsSync, writeFileSync } from "node:fs";
 import { basename, dirname, join } from "node:path";
+import { dumpInstanceContainerLogs } from "./container-logs.js";
 import { ensureRunnerOnNetwork, netReachMode, STUDIO_INTERNAL_PORT, studioBaseFrom, } from "./container-net.js";
 import { cleanupDaemon, requireLicenseFile, runCli, startDaemon, } from "./daemon.js";
 import { hashSlot } from "./harness-config.js";
@@ -81,6 +82,7 @@ export const defaultSmokeDeps = {
     ensureNetwork: () => ensureRunnerOnNetwork(),
     supportsNoPublish: ctlSupportsNoPublish,
     containerUser: runnerContainerUser,
+    diagnose: (instanceId) => dumpInstanceContainerLogs(instanceId),
     log: (line) => console.log(`[smoke] ${line}`),
 };
 function describeObservation(o) {
@@ -304,11 +306,21 @@ export async function runProductSmoke(slug, spec, deps = defaultSmokeDeps) {
             });
         }
         for (const o of spec.observe) {
-            await pollUntil(() => observationSatisfied(o, ctx, deps.readers), {
-                timeoutMs: timeouts.observeMs,
-                intervalMs: 1000,
-                label: `${describeObservation(o)} never satisfied${vacuous ? "" : " while the sources pumped"}`,
-            });
+            try {
+                await pollUntil(() => observationSatisfied(o, ctx, deps.readers), {
+                    timeoutMs: timeouts.observeMs,
+                    intervalMs: 1000,
+                    label: `${describeObservation(o)} never satisfied${vacuous ? "" : " while the sources pumped"}`,
+                });
+            }
+            catch (e) {
+                // Only this phase: a not-yet or cleared failure is a statement about the
+                // observable itself, where a container dump adds noise, not cause. Here
+                // the predicate stayed false for a reason that lives in the containers
+                // -- and cleanup removes them moments from now.
+                const dump = deps.diagnose?.(instanceId) ?? "";
+                throw dump ? new Error(`${e instanceof Error ? e.message : String(e)}\n${dump}`, { cause: e }) : e;
+            }
         }
         deps.log(`${slug}: satisfied phase passed for ${spec.observe.length} observation(s)`);
         if (!vacuous) {