fix(e2e): support plain telegram install timeouts · openclaw/openclaw@2fcf990
vincentkoc
·
2026-05-27
·
via Recent Commits to openclaw:main
| Original file line number | Diff line number | Diff line change |
|---|
@@ -243,7 +243,11 @@ npm_install_timeout="${OPENCLAW_E2E_NPM_INSTALL_TIMEOUT:-600s}"
|
243 | 243 | if [ -z "$npm_install_timeout" ] || [ "$npm_install_timeout" = "0" ]; then |
244 | 244 | npm install -g "$install_source" --no-fund --no-audit |
245 | 245 | elif command -v timeout >/dev/null 2>&1; then |
246 | | - timeout --kill-after=30s "$npm_install_timeout" npm install -g "$install_source" --no-fund --no-audit |
| 246 | + if timeout --kill-after=1s 1s true >/dev/null 2>&1; then |
| 247 | + timeout --kill-after=30s "$npm_install_timeout" npm install -g "$install_source" --no-fund --no-audit |
| 248 | + else |
| 249 | + timeout "$npm_install_timeout" npm install -g "$install_source" --no-fund --no-audit |
| 250 | + fi |
247 | 251 | else |
248 | 252 | echo "timeout command not found; running package install without OPENCLAW_E2E_NPM_INSTALL_TIMEOUT" >&2 |
249 | 253 | npm install -g "$install_source" --no-fund --no-audit |
|
| Original file line number | Diff line number | Diff line change |
|---|
@@ -267,7 +267,11 @@ npm_install_timeout="${OPENCLAW_E2E_NPM_INSTALL_TIMEOUT:-600s}"
|
267 | 267 | if [ -z "$npm_install_timeout" ] || [ "$npm_install_timeout" = "0" ]; then |
268 | 268 | npm install -g "$install_source" --no-fund --no-audit |
269 | 269 | elif command -v timeout >/dev/null 2>&1; then |
270 | | - timeout --kill-after=30s "$npm_install_timeout" npm install -g "$install_source" --no-fund --no-audit |
| 270 | + if timeout --kill-after=1s 1s true >/dev/null 2>&1; then |
| 271 | + timeout --kill-after=30s "$npm_install_timeout" npm install -g "$install_source" --no-fund --no-audit |
| 272 | + else |
| 273 | + timeout "$npm_install_timeout" npm install -g "$install_source" --no-fund --no-audit |
| 274 | + fi |
271 | 275 | else |
272 | 276 | echo "timeout command not found; running package install without OPENCLAW_E2E_NPM_INSTALL_TIMEOUT" >&2 |
273 | 277 | npm install -g "$install_source" --no-fund --no-audit |
|
| Original file line number | Diff line number | Diff line change |
|---|
@@ -46,6 +46,10 @@ describe("package Telegram live Docker E2E", () => {
|
46 | 46 | expect(installRun).toContain( |
47 | 47 | 'timeout --kill-after=30s "$npm_install_timeout" npm install -g "$install_source" --no-fund --no-audit', |
48 | 48 | ); |
| 49 | +expect(installRun).toContain("timeout --kill-after=1s 1s true >/dev/null 2>&1"); |
| 50 | +expect(installRun).toContain( |
| 51 | +'timeout "$npm_install_timeout" npm install -g "$install_source" --no-fund --no-audit', |
| 52 | +); |
49 | 53 | expect(installRun).toContain('npm install -g "$install_source" --no-fund --no-audit'); |
50 | 54 | expect(installRun).toContain('"${package_mount_args[@]}"'); |
51 | 55 | expect(installRun).not.toContain('"${docker_env[@]}"'); |
|
| Original file line number | Diff line number | Diff line change |
|---|
@@ -149,6 +149,10 @@ describe("RTT harness", () => {
|
149 | 149 | expect(script).toContain( |
150 | 150 | 'timeout --kill-after=30s "$npm_install_timeout" npm install -g "$install_source" --no-fund --no-audit', |
151 | 151 | ); |
| 152 | +expect(script).toContain("timeout --kill-after=1s 1s true >/dev/null 2>&1"); |
| 153 | +expect(script).toContain( |
| 154 | +'timeout "$npm_install_timeout" npm install -g "$install_source" --no-fund --no-audit', |
| 155 | +); |
152 | 156 | expect(script).toContain("run_logged docker_e2e_docker_run_cmd run --rm"); |
153 | 157 | expect(script).not.toContain("run_logged docker run --rm"); |
154 | 158 | expect(heartbeatStartIndex).toBeGreaterThan(sourceIndex); |
|
此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。 原文来自 — 版权归原作者所有。
