fix(test-suite): fail clean on teardown errors

Author: Eikix

test-suite/fhevm/src/artifacts.ts

@@ -556,15 +556,17 @@ export const composeUp = async (
 
 export const composeDown = async (component: string, deps: Pick<ArtifactDeps, "liveRunner">) => {
   if (!(await exists(composePath(component)))) {
-    return;
+    return true;
   }
   const code = await deps.liveRunner([...dockerArgs(component), "down", "-v"], {
     allowFailure: true,
     env: await composeEnv(),
   });
   if (code !== 0) {
     console.warn(`[warn] compose down failed for ${component} (${code})`);
+    return false;
   }
+  return true;
 };
 
 export const regen = async (state: State, deps: Pick<ArtifactDeps, "runner">) => {

test-suite/fhevm/src/cli.test.ts

@@ -555,6 +555,28 @@ describe("runtime invariants", () => {
     }
   });
 
+  test("clean keeps runtime state when teardown fails", async () => {
+    process.chdir(REPO_ROOT);
+    const before = await maybeRead(STATE_FILE);
+    await fs.rm(STATE_DIR, { recursive: true, force: true });
+    await fs.mkdir(STATE_DIR, { recursive: true });
+    const state = stubState({ discovery: readyDiscovery(), completedSteps: ["bootstrap"] });
+    await fs.writeFile(STATE_FILE, JSON.stringify(state));
+    const { logs, restore } = captureConsole("error");
+    try {
+      await main(["bun", "src/cli.ts", "clean"], { ...noopDeps, liveRunner: async () => 1 });
+    } finally {
+      restore();
+    }
+    expect(await maybeRead(STATE_FILE)).toBeDefined();
+    expect(logs.some((l) => l.includes("Failed to stop components"))).toBe(true);
+    await fs.rm(STATE_DIR, { recursive: true, force: true });
+    if (before !== undefined) {
+      await fs.mkdir(STATE_DIR, { recursive: true });
+      await fs.writeFile(STATE_FILE, before);
+    }
+  });
+
   test("up --dry-run reports a helpful message when gh is missing", async () => {
     const { logs, restore } = captureConsole("error");
     try {

test-suite/fhevm/src/runtime.ts

@@ -575,11 +575,17 @@ const waitForRelayer = async (deps: RuntimeDeps) => {
 
 const resetAfterStep = async (step: StepName, deps: RuntimeDeps) => {
   const start = stateStepIndex(step);
+  const failed: string[] = [];
   for (let index = STEP_NAMES.length - 1; index >= start; index -= 1) {
     for (const component of COMPONENT_BY_STEP[STEP_NAMES[index]]) {
-      await composeDown(component, deps);
+      if (!(await composeDown(component, deps))) {
+        failed.push(component);
+      }
     }
   }
+  if (failed.length) {
+    throw new Error(`Failed to stop components while resetting from ${step}: ${failed.join(", ")}`);
+  }
 };
 
 const ensureRuntimeArtifacts = async (state: State, deps: Pick<RuntimeDeps, "runner">, reason: string) => {
@@ -1072,17 +1078,23 @@ const runDown = async (deps: RuntimeDeps) => {
     await ensureRuntimeArtifacts(state, deps, "teardown");
   }
   let stopped = false;
+  const failed: string[] = [];
   for (const component of [...COMPONENTS].reverse()) {
     if (!(await exists(composePath(component)))) {
       continue;
     }
     stopped = true;
     log(`[down] ${component}`);
-    await composeDown(component, deps);
+    if (!(await composeDown(component, deps))) {
+      failed.push(component);
+    }
   }
   if (!stopped) {
     log("[down] nothing to stop");
   }
+  if (failed.length) {
+    throw new Error(`Failed to stop components: ${failed.join(", ")}`);
+  }
 };
 
 const runStatus = async (deps: RuntimeDeps) => {