@testmuai/rook 0.1.3 → 0.1.5

package/bin/rook.test.mjs

@@ -434,29 +434,57 @@ describe("rook.cjs signal propagation (real subprocess)", () => {
     rmSync(childPidFile, { force: true });
     writeExecutableFixture(
       tag,
-      `#!/bin/sh\necho $$ > ${JSON.stringify(childPidFile)}\nsleep 30\n`,
+      `#!/bin/sh\necho $$ > ${JSON.stringify(childPidFile)}\nexec sleep 30\n`,
     );
 
-    const trampoline = spawn(process.execPath, [join(BIN_DIR, "rook.cjs")], {
+    const readyFile = join(BIN_DIR, "forwarding.ready");
+    const preload = join(BIN_DIR, "forwarding-ready.cjs");
+    rmSync(readyFile, { force: true });
+    writeFileSync(preload, `
+      const { writeFileSync } = require("node:fs");
+      process.on("newListener", (signal) => {
+        if (signal === "SIGTERM") process.nextTick(() => {
+          writeFileSync(${JSON.stringify(readyFile)}, "ready");
+        });
+      });
+    `);
+
+    const trampoline = spawn(process.execPath, ["--require", preload, join(BIN_DIR, "rook.cjs")], {
       cwd: BIN_DIR,
       stdio: "ignore",
+      // Give this fixture a process group so failures can clean up only its processes.
+      detached: true,
     });
 
-    const childPid = await waitForFileContent(childPidFile, 5000);
-    expect(childPid).toBeTruthy();
-
-    const exited = new Promise((resolve) => trampoline.on("exit", resolve));
-    // kill(pid) (no leading dash) always targets exactly that one
-    // process, never its process group — unlike an interactive
-    // terminal's Ctrl-C, which reaches the whole group and would mask
-    // this bug even without the fix.
-    process.kill(trampoline.pid, "SIGTERM");
-    await exited;
-    // Give the forwarded signal a moment to actually land before checking.
-    await new Promise((resolve) => setTimeout(resolve, 300));
-
-    expect(isAlive(Number(childPid))).toBe(false);
-  });
+    try {
+      // The child may start before its parent's signal handlers are installed.
+      const [pid] = await Promise.all([
+        waitForFileContent(childPidFile, 5000),
+        waitForFileContent(readyFile, 5000),
+      ]);
+      const childPid = Number(pid);
+      expect(Number.isSafeInteger(childPid) && childPid > 0).toBe(true);
+      // Signal only the advertised PID: signalling the group would hide broken forwarding.
+      process.kill(trampoline.pid, "SIGTERM");
+      await vi.waitFor(() => {
+        expect(trampoline.signalCode, "trampoline must preserve SIGTERM").toBe("SIGTERM");
+        expect(isAlive(childPid), `fixture child ${childPid} must exit after forwarded SIGTERM`).toBe(false);
+      }, { timeout: 5000, interval: 20 });
+    } finally {
+      if (trampoline.pid) {
+        try {
+          process.kill(-trampoline.pid, "SIGKILL");
+        } catch (error) {
+          if (error.code !== "ESRCH") throw error;
+        }
+        await vi.waitFor(() => {
+          expect(trampoline.exitCode !== null || trampoline.signalCode !== null).toBe(true);
+        }, { timeout: 1000, interval: 20 });
+      }
+      rmSync(readyFile, { force: true });
+      rmSync(preload, { force: true });
+    }
+  }, 12000);
 });
 
 function waitForFileContent(path, timeoutMs) {
@@ -464,8 +492,11 @@ function waitForFileContent(path, timeoutMs) {
   return new Promise((resolve, reject) => {
     const poll = () => {
       if (existsSync(path)) {
-        resolve(readFileSync(path, "utf8").trim());
-        return;
+        const content = readFileSync(path, "utf8").trim();
+        if (content) {
+          resolve(content);
+          return;
+        }
       }
       if (Date.now() > deadline) {
         reject(new Error(`timed out waiting for ${path}`));
@@ -481,7 +512,8 @@ function isAlive(pid) {
   try {
     process.kill(pid, 0);
     return true;
-  } catch {
-    return false;
+  } catch (error) {
+    if (error.code === "ESRCH") return false;
+    throw error;
   }
 }