vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-28 06:59:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(e2e): support plain telegram install timeouts

Browse Source
This commit is contained in:
Vincent Koc
2026-05-26 22:03:48 +02:00
parent 639e7ff997
commit 2fcf990cee
4 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/e2e/npm-telegram-live-docker.sh
View File

@@ -243,7 +243,11 @@ npm_install_timeout="${OPENCLAW_E2E_NPM_INSTALL_TIMEOUT:-600s}"
if [ -z "$npm_install_timeout" ] || [ "$npm_install_timeout" = "0" ]; then
npm install -g "$install_source" --no-fund --no-audit
elif command -v timeout >/dev/null 2>&1; then
timeout --kill-after=30s "$npm_install_timeout" npm install -g "$install_source" --no-fund --no-audit
if timeout --kill-after=1s 1s true >/dev/null 2>&1; then
timeout --kill-after=30s "$npm_install_timeout" npm install -g "$install_source" --no-fund --no-audit
else
timeout "$npm_install_timeout" npm install -g "$install_source" --no-fund --no-audit
fi
else
echo "timeout command not found; running package install without OPENCLAW_E2E_NPM_INSTALL_TIMEOUT" >&2
npm install -g "$install_source" --no-fund --no-audit

6
scripts/e2e/npm-telegram-rtt-docker.sh
View File

@@ -267,7 +267,11 @@ npm_install_timeout="${OPENCLAW_E2E_NPM_INSTALL_TIMEOUT:-600s}"
if [ -z "$npm_install_timeout" ] || [ "$npm_install_timeout" = "0" ]; then
npm install -g "$install_source" --no-fund --no-audit
elif command -v timeout >/dev/null 2>&1; then
timeout --kill-after=30s "$npm_install_timeout" npm install -g "$install_source" --no-fund --no-audit
if timeout --kill-after=1s 1s true >/dev/null 2>&1; then
timeout --kill-after=30s "$npm_install_timeout" npm install -g "$install_source" --no-fund --no-audit
else
timeout "$npm_install_timeout" npm install -g "$install_source" --no-fund --no-audit
fi
else
echo "timeout command not found; running package install without OPENCLAW_E2E_NPM_INSTALL_TIMEOUT" >&2
npm install -g "$install_source" --no-fund --no-audit

4
test/scripts/npm-telegram-live.test.ts
View File

@@ -46,6 +46,10 @@ describe("package Telegram live Docker E2E", () => {
expect(installRun).toContain(
'timeout --kill-after=30s "$npm_install_timeout" npm install -g "$install_source" --no-fund --no-audit',
);
expect(installRun).toContain("timeout --kill-after=1s 1s true >/dev/null 2>&1");
expect(installRun).toContain(
'timeout "$npm_install_timeout" npm install -g "$install_source" --no-fund --no-audit',
);
expect(installRun).toContain('npm install -g "$install_source" --no-fund --no-audit');
expect(installRun).toContain('"${package_mount_args[@]}"');
expect(installRun).not.toContain('"${docker_env[@]}"');

4
test/scripts/rtt-harness.test.ts
View File

@@ -149,6 +149,10 @@ describe("RTT harness", () => {
expect(script).toContain(
'timeout --kill-after=30s "$npm_install_timeout" npm install -g "$install_source" --no-fund --no-audit',
);
expect(script).toContain("timeout --kill-after=1s 1s true >/dev/null 2>&1");
expect(script).toContain(
'timeout "$npm_install_timeout" npm install -g "$install_source" --no-fund --no-audit',
);
expect(script).toContain("run_logged docker_e2e_docker_run_cmd run --rm");
expect(script).not.toContain("run_logged docker run --rm");
expect(heartbeatStartIndex).toBeGreaterThan(sourceIndex);