@norskvideo/ctl-test-harness 0.1.15 → 0.1.17

package/package.json

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

package/smoke.d.ts

@@ -34,7 +34,14 @@ export interface SmokeContext {
     }): Promise<CliResult>;
     fetchStudio(path: string): Promise<Response>;
 }
-export type SmokeObservation = {
+/** Set on any observation that holds with or without a source — a resilient
+ *  switch that keeps a ladder fed from a slate, a control surface that is up
+ *  regardless — so it runs the satisfied phase only. `components` is
+ *  structural by nature and needs no flag. */
+interface Structural {
+    structural?: boolean;
+}
+export type SmokeObservation = Structural & ({
     kind: "components";
     ids: string[];
 } | {
@@ -60,7 +67,7 @@ export type SmokeObservation = {
     kind: "custom";
     label: string;
     satisfied: (ctx: SmokeContext) => Promise<boolean>;
-};
+});
 export interface SmokeSpec {
     product: {
         /** Manifest name, e.g. "norsk-probe". The registration must report it. */
@@ -125,6 +132,8 @@ export interface SmokeDeps {
     /** Docker leaves root-owned bind-mount targets under the store; a non-root
      *  runner cannot rm them, so they go from a throwaway root container. */
     nukeStoreAsRoot(storeDir: string): void;
+    /** After the nuke: is the store still there? (Then the nuke did not work.) */
+    storeExists(storeDir: string): boolean;
     ensureNetwork(): ReturnType<typeof ensureRunnerOnNetwork>;
     supportsNoPublish(): Promise<boolean>;
     containerUser(): string | undefined;
@@ -140,8 +149,10 @@ export interface SmokePorts extends BaseHarnessPorts {
 export declare function smokePorts(slug: string, overrides?: Partial<SmokePorts>): SmokePorts;
 export declare const defaultSmokeDeps: SmokeDeps;
 /** Whether an observation depends on a source being pumped. Structural ones
- *  run the satisfied phase only. */
+ *  (`components`, or anything the spec marks `structural`) run the satisfied
+ *  phase only. */
 export declare function sourceDependent(o: SmokeObservation): boolean;
 /** One sample of an observation — the predicate the three phases poll. */
 export declare function observationSatisfied(o: SmokeObservation, ctx: SmokeContext, readers: SmokeReaders): Promise<boolean>;
 export declare function runProductSmoke(slug: string, spec: SmokeSpec, deps?: SmokeDeps): Promise<void>;
+export {};

package/smoke.js

@@ -18,7 +18,7 @@
 // not a dependency of this package (daemon.ts's cleanupDaemon has the same
 // rule); a product wanting typed commands bridges with toArgv in its own spec.
 import { spawnSync } from "node:child_process";
-import { writeFileSync } from "node:fs";
+import { existsSync, writeFileSync } from "node:fs";
 import { basename, dirname, join } from "node:path";
 import { ensureRunnerOnNetwork, netReachMode, STUDIO_INTERNAL_PORT, studioBaseFrom, } from "./container-net.js";
 import { cleanupDaemon, requireLicenseFile, runCli, startDaemon, } from "./daemon.js";
@@ -77,6 +77,7 @@ export const defaultSmokeDeps = {
             `rm -rf /base/${basename(storeDir)}`,
         ]);
     },
+    storeExists: (storeDir) => existsSync(storeDir),
     ensureNetwork: () => ensureRunnerOnNetwork(),
     supportsNoPublish: ctlSupportsNoPublish,
     containerUser: runnerContainerUser,
@@ -99,9 +100,10 @@ function describeObservation(o) {
     }
 }
 /** Whether an observation depends on a source being pumped. Structural ones
- *  run the satisfied phase only. */
+ *  (`components`, or anything the spec marks `structural`) run the satisfied
+ *  phase only. */
 export function sourceDependent(o) {
-    return o.kind !== "components";
+    return o.kind !== "components" && o.structural !== true;
 }
 /** One sample of an observation — the predicate the three phases poll. */
 export async function observationSatisfied(o, ctx, readers) {
@@ -186,6 +188,7 @@ export async function runProductSmoke(slug, spec, deps = defaultSmokeDeps) {
     let daemon = null;
     let launched = false;
     let handles = [];
+    let journeyError;
     try {
         // The same zero point as the guides: `init` on a virgin store, not a seeded
         // config.yaml. No http redirect (port 80 needs root) and a banded proxy port
@@ -319,9 +322,15 @@ export async function runProductSmoke(slug, spec, deps = defaultSmokeDeps) {
             deps.log(`${slug}: cleared phase passed for ${phased.length} observation(s)`);
         }
     }
-    finally {
-        if (handles.length)
-            await deps.stopSources(handles).catch(() => { });
+    catch (e) {
+        journeyError = e;
+    }
+    if (handles.length)
+        await deps.stopSources(handles).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.
+    try {
         await deps.cleanup({
             deleteInstance: (id) => cli(["instance", "delete", id, "--purge"]),
             stopDaemon: () => cli(["shutdown", "--daemon-only"]),
@@ -330,6 +339,14 @@ export async function runProductSmoke(slug, spec, deps = defaultSmokeDeps) {
             storeDir,
             containers: [`norsk-inst-${instanceId}-studio`, `norsk-inst-${instanceId}-media`],
         });
-        deps.nukeStoreAsRoot(storeDir);
+    }
+    catch (e) {
+        deps.log(`${slug}: cleanup could not remove the store itself (${e instanceof Error ? e.message : String(e)}); nuking as root`);
+    }
+    deps.nukeStoreAsRoot(storeDir);
+    if (journeyError !== undefined)
+        throw journeyError;
+    if (deps.storeExists(storeDir)) {
+        throw new Error(`${slug}: store ${storeDir} still present after the root-container nuke`);
     }
 }