ewilliams28/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-08-12 21:53:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(e2e): require bounded helper timeouts

Browse Source
This commit is contained in:
Vincent Koc
2026-05-27 01:10:50 +02:00
parent 068d88c142
commit 0028c2f793
2 changed files with 73 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/lib/openclaw-e2e-instance.sh
+2 -3
View File
@@ -52,9 +52,8 @@ openclaw_e2e_maybe_timeout() {
timeout_bin="gtimeout"
fi
if [ -z "$timeout_bin" ]; then
echo "timeout command not found; running OpenClaw E2E command without timeout $timeout_value" >&2
"$@"
return
echo "timeout or gtimeout is required for OpenClaw E2E command timeout $timeout_value" >&2
return 127
fi
if "$timeout_bin" --kill-after=1s 1s true >/dev/null 2>&1; then
"$timeout_bin" --kill-after=30s "$timeout_value" "$@"
test/scripts/openclaw-e2e-instance.test.ts
+71 -5
View File
@@ -180,7 +180,68 @@ describe("scripts/lib/openclaw-e2e-instance.sh", () => {
}
});
it("runs package installs without a wrapper when timeout is unavailable", () => {
it("uses gtimeout when GNU timeout is not on PATH", () => {
const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "openclaw-e2e-instance-gtimeout-"));
try {
const timeoutArgsPath = path.join(tempDir, "timeout-args.txt");
const npmArgsPath = path.join(tempDir, "npm-args.txt");
const logPath = path.join(tempDir, "install.log");
const packagePath = path.join(tempDir, "openclaw.tgz");
fs.writeFileSync(packagePath, "");
fs.writeFileSync(
path.join(tempDir, "gtimeout"),
[
"#!/bin/bash",
"set -euo pipefail",
'printf "%s\\n" "$*" >"$OPENCLAW_TEST_TIMEOUT_ARGS"',
'while [ "$#" -gt 0 ] && [ "$1" != "npm" ]; do shift; done',
'exec "$@"',
"",
].join("\n"),
);
fs.writeFileSync(
path.join(tempDir, "npm"),
["#!/bin/sh", "set -eu", 'printf "%s\\n" "$*" >"$OPENCLAW_TEST_NPM_ARGS"', ""].join("\n"),
);
fs.chmodSync(path.join(tempDir, "gtimeout"), 0o755);
fs.chmodSync(path.join(tempDir, "npm"), 0o755);
const result = spawnSync(
"/bin/bash",
[
"-c",
[
"set -euo pipefail",
`source ${shellQuote(helperPath)}`,
`openclaw_e2e_install_package ${shellQuote(logPath)} ${shellQuote("fixture package")}`,
].join("; "),
],
{
encoding: "utf8",
env: {
...process.env,
PATH: tempDir,
OPENCLAW_CURRENT_PACKAGE_TGZ: packagePath,
OPENCLAW_E2E_NPM_INSTALL_TIMEOUT: "42s",
OPENCLAW_TEST_TIMEOUT_ARGS: timeoutArgsPath,
OPENCLAW_TEST_NPM_ARGS: npmArgsPath,
},
},
);
expect(result.status).toBe(0);
expect(fs.readFileSync(timeoutArgsPath, "utf8").trim()).toBe(
`--kill-after=30s 42s npm install -g ${packagePath} --no-fund --no-audit`,
);
expect(fs.readFileSync(npmArgsPath, "utf8").trim()).toBe(
`install -g ${packagePath} --no-fund --no-audit`,
);
} finally {
fs.rmSync(tempDir, { force: true, recursive: true });
}
});
it("fails package installs when no timeout binary is available", () => {
const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "openclaw-e2e-instance-no-timeout-"));
try {
const npmArgsPath = path.join(tempDir, "npm-args.txt");
@@ -191,6 +252,7 @@ describe("scripts/lib/openclaw-e2e-instance.sh", () => {
path.join(tempDir, "npm"),
["#!/bin/sh", "set -eu", 'printf "%s\\n" "$*" >"$OPENCLAW_TEST_NPM_ARGS"', ""].join("\n"),
);
fs.symlinkSync("/bin/cat", path.join(tempDir, "cat"));
fs.chmodSync(path.join(tempDir, "npm"), 0o755);
const result = spawnSync(
@@ -215,11 +277,15 @@ describe("scripts/lib/openclaw-e2e-instance.sh", () => {
},
);
expect(result.status).toBe(0);
expect(fs.readFileSync(logPath, "utf8")).toContain("timeout command not found");
expect(fs.readFileSync(npmArgsPath, "utf8").trim()).toBe(
`install -g ${packagePath} --no-fund --no-audit`,
expect(result.status).not.toBe(0);
expect(result.stderr).toContain(
"timeout or gtimeout is required for OpenClaw E2E command timeout 42s",
);
expect(result.stderr).toContain("npm install failed for fixture package");
expect(fs.readFileSync(logPath, "utf8")).toContain(
"timeout or gtimeout is required for OpenClaw E2E command timeout 42s",
);
expect(fs.existsSync(npmArgsPath)).toBe(false);
} finally {
fs.rmSync(tempDir, { force: true, recursive: true });
}