test: stabilize e2e timeout fixture path

steipete · steipete · commit c5b9a538ceab · 2026-05-27T08:53:20.000+01:00
diff --git a/test/scripts/openclaw-e2e-instance.test.ts b/test/scripts/openclaw-e2e-instance.test.ts
@@ -5,7 +5,13 @@ import path from "node:path";
 import { describe, expect, it } from "vitest";
 
 const helperPath = path.resolve("scripts/lib/openclaw-e2e-instance.sh");
-const hostPath = process.env.PATH?.trim() || "/usr/local/bin:/opt/homebrew/bin:/usr/bin:/bin";
+const hostPath = [
+  path.dirname(process.execPath),
+  "/usr/local/bin",
+  "/opt/homebrew/bin",
+  "/usr/bin",
+  "/bin",
+].join(path.delimiter);
 
 function shellQuote(value: string): string {
   return `'${value.replace(/'/gu, `'\\''`)}'`;
@@ -65,6 +71,16 @@ function writePackageFixture(packagePath: string): void {
   }
 }
 
+function writeNodeShim(binDir: string): void {
+  const nodePath = path.join(binDir, "node");
+  try {
+    fs.symlinkSync(process.execPath, nodePath);
+  } catch {
+    fs.writeFileSync(nodePath, `#!/bin/sh\nexec ${shellQuote(process.execPath)} "$@"\n`);
+    fs.chmodSync(nodePath, 0o755);
+  }
+}
+
 describe("scripts/lib/openclaw-e2e-instance.sh", () => {
   it("sources decoded test-state scripts", () => {
     const result = runHelper(base64('export OPENCLAW_E2E_INSTANCE_TEST="ok"\n'));
@@ -294,8 +310,8 @@ describe("scripts/lib/openclaw-e2e-instance.sh", () => {
       const npmArgsPath = path.join(tempDir, "npm-args.txt");
       const logPath = path.join(tempDir, "install.log");
       const packagePath = path.join(tempDir, "openclaw.tgz");
-      const nodeBinDir = path.dirname(process.execPath);
       writePackageFixture(packagePath);
+      writeNodeShim(tempDir);
       fs.writeFileSync(
         path.join(tempDir, "npm"),
         ["#!/bin/sh", "set -eu", 'printf "%s\\n" "$*" >"$OPENCLAW_TEST_NPM_ARGS"', ""].join("\n"),
@@ -315,7 +331,7 @@ describe("scripts/lib/openclaw-e2e-instance.sh", () => {
         {
           encoding: "utf8",
           env: shellTestEnv({
-            PATH: `${tempDir}:${nodeBinDir}`,
+            PATH: tempDir,
             OPENCLAW_CURRENT_PACKAGE_TGZ: packagePath,
             OPENCLAW_E2E_NPM_INSTALL_TIMEOUT: "42s",
             OPENCLAW_TEST_NPM_ARGS: npmArgsPath,
@@ -336,7 +352,7 @@ describe("scripts/lib/openclaw-e2e-instance.sh", () => {
   it("bounds commands with the Node watchdog when timeout is unavailable", () => {
     const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "openclaw-e2e-instance-node-watchdog-"));
     try {
-      const nodeBinDir = path.dirname(process.execPath);
+      writeNodeShim(tempDir);
       const startedAt = Date.now();
       const result = spawnSync(
         "/bin/bash",
@@ -351,7 +367,7 @@ describe("scripts/lib/openclaw-e2e-instance.sh", () => {
         {
           encoding: "utf8",
           env: shellTestEnv({
-            PATH: `${tempDir}:${nodeBinDir}`,
+            PATH: tempDir,
           }),
           timeout: 5_000,
         },
@@ -460,7 +476,7 @@ describe("scripts/lib/openclaw-e2e-instance.sh", () => {
         {
           encoding: "utf8",
           env: shellTestEnv({
-            PATH: `${tempDir}:${process.env.PATH ?? ""}`,
+            PATH: `${tempDir}:${hostPath}`,
             OPENCLAW_E2E_COMMAND_TIMEOUT: "17s",
             OPENCLAW_TEST_TIMEOUT_ARGS: timeoutArgsPath,
             OPENCLAW_TEST_COMMAND_ARGS: commandArgsPath,
@@ -527,7 +543,7 @@ describe("scripts/lib/openclaw-e2e-instance.sh", () => {
         {
           encoding: "utf8",
           env: shellTestEnv({
-            PATH: `${tempDir}:${process.env.PATH ?? ""}`,
+            PATH: `${tempDir}:${hostPath}`,
             OPENCLAW_E2E_COMMAND_TIMEOUT: "23s",
             OPENCLAW_TEST_TIMEOUT_ARGS: timeoutArgsPath,
             OPENCLAW_TEST_COMMAND_ARGS: commandArgsPath,
@@ -592,7 +608,7 @@ describe("scripts/lib/openclaw-e2e-instance.sh", () => {
         {
           encoding: "utf8",
           env: shellTestEnv({
-            PATH: `${tempDir}:${process.env.PATH ?? ""}`,
+            PATH: `${tempDir}:${hostPath}`,
             OPENCLAW_E2E_COMMAND_TIMEOUT: "31s",
             OPENCLAW_TEST_TIMEOUT_ARGS: timeoutArgsPath,
             OPENCLAW_TEST_SCRIPT_ARGS: scriptArgsPath,
