fix(test): reject malformed cron cleanup limits

vincentkoc · vincentkoc · commit e38b8f6a201d · 2026-06-03T00:07:24.000+02:00
diff --git a/scripts/e2e/cron-mcp-cleanup-docker-client.ts b/scripts/e2e/cron-mcp-cleanup-docker-client.ts
@@ -7,12 +7,10 @@ import { setTimeout as delay } from "node:timers/promises";
 import { pathToFileURL } from "node:url";
 import { promisify } from "node:util";
 import type { GatewayRpcClient } from "./mcp-channels-harness.ts";
+import { readPositiveIntEnv } from "./lib/env-limits.mjs";
 
 const execFileAsync = promisify(execFile);
-const PROBE_PID_WAIT_MS = readPositiveInt(
-  process.env.OPENCLAW_CRON_MCP_CLEANUP_PID_WAIT_MS,
-  120_000,
-);
+const PROBE_PID_WAIT_MS = readCronMcpCleanupProbePidWaitMs();
 type McpChannelsHarness = typeof import("./mcp-channels-harness.ts");
 let mcpChannelsHarness: McpChannelsHarness | undefined;
 
@@ -25,13 +23,8 @@ async function loadMcpChannelsHarness(): Promise<McpChannelsHarness> {
   return mcpChannelsHarness;
 }
 
-function readPositiveInt(raw: string | undefined, fallback: number): number {
-  const text = (raw ?? "").trim();
-  if (!/^\d+$/u.test(text)) {
-    return fallback;
-  }
-  const parsed = Number(text);
-  return Number.isInteger(parsed) && parsed > 0 ? parsed : fallback;
+export function readCronMcpCleanupProbePidWaitMs(env: NodeJS.ProcessEnv = process.env): number {
+  return readPositiveIntEnv("OPENCLAW_CRON_MCP_CLEANUP_PID_WAIT_MS", 120_000, env);
 }
 
 async function readProbePid(pidPath: string): Promise<number | undefined> {
diff --git a/test/scripts/cron-mcp-cleanup-docker-client.test.ts b/test/scripts/cron-mcp-cleanup-docker-client.test.ts
@@ -2,9 +2,26 @@ import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
 import { describe, expect, it } from "vitest";
-import { waitForProbePid } from "../../scripts/e2e/cron-mcp-cleanup-docker-client.ts";
+import {
+  readCronMcpCleanupProbePidWaitMs,
+  waitForProbePid,
+} from "../../scripts/e2e/cron-mcp-cleanup-docker-client.ts";
 
 describe("cron MCP cleanup docker client", () => {
+  it("rejects malformed probe pid wait limits", () => {
+    expect(readCronMcpCleanupProbePidWaitMs({})).toBe(120_000);
+    expect(
+      readCronMcpCleanupProbePidWaitMs({ OPENCLAW_CRON_MCP_CLEANUP_PID_WAIT_MS: "250" }),
+    ).toBe(250);
+    for (const value of ["1.5", "1e3", "10ms", "0"]) {
+      expect(() =>
+        readCronMcpCleanupProbePidWaitMs({
+          OPENCLAW_CRON_MCP_CLEANUP_PID_WAIT_MS: value,
+        }),
+      ).toThrow("invalid OPENCLAW_CRON_MCP_CLEANUP_PID_WAIT_MS");
+    }
+  });
+
   it("bounds missing probe pid waits", async () => {
     const root = fs.mkdtempSync(path.join(os.tmpdir(), "openclaw-cron-mcp-client-"));
     try {
