fix(e2e): kill timed docker scenario runners · openclaw/openclaw@d5bf325
vincentkoc
·
2026-05-27
·
via Recent Commits to openclaw:main
| Original file line number | Diff line number | Diff line change |
|---|
@@ -57,6 +57,7 @@ const PLUGIN_UPDATE_PROBE_PATH = "scripts/e2e/lib/plugin-update/probe.mjs";
|
57 | 57 | const DOCTOR_SWITCH_DOCKER_E2E_PATH = "scripts/e2e/doctor-install-switch-docker.sh"; |
58 | 58 | const DOCTOR_SWITCH_SCENARIO_PATH = "scripts/e2e/lib/doctor-install-switch/scenario.sh"; |
59 | 59 | const PACKAGE_COMPAT_PATH = "scripts/e2e/lib/package-compat.mjs"; |
| 60 | +const UPGRADE_SURVIVOR_DOCKER_E2E_PATH = "scripts/e2e/upgrade-survivor-docker.sh"; |
60 | 61 | const UPDATE_CHANNEL_SWITCH_DOCKER_E2E_PATH = "scripts/e2e/update-channel-switch-docker.sh"; |
61 | 62 | const UPDATE_CHANNEL_SWITCH_ASSERTIONS_PATH = |
62 | 63 | "scripts/e2e/lib/update-channel-switch/assertions.mjs"; |
@@ -558,6 +559,20 @@ grep -qx -- "OPENCLAW_E2E_NPM_INSTALL_TIMEOUT=42s" "$TMPDIR/package-args"
|
558 | 559 | } |
559 | 560 | }); |
560 | 561 | |
| 562 | +it("kills timed Docker scenario runners after the grace period", () => { |
| 563 | +const multiNode = readFileSync(MULTI_NODE_UPDATE_DOCKER_E2E_PATH, "utf8"); |
| 564 | +const upgradeSurvivor = readFileSync(UPGRADE_SURVIVOR_DOCKER_E2E_PATH, "utf8"); |
| 565 | + |
| 566 | +expect(multiNode).toContain('timeout --kill-after=30s "$DOCKER_RUN_TIMEOUT" bash -lc'); |
| 567 | +expect(upgradeSurvivor).toContain( |
| 568 | +'timeout --kill-after=30s "$DOCKER_RUN_TIMEOUT" bash scripts/e2e/lib/upgrade-survivor/run.sh', |
| 569 | +); |
| 570 | +expect(upgradeSurvivor).toContain('timeout --kill-after=30s "$DOCKER_RUN_TIMEOUT" bash -lc'); |
| 571 | +for (const script of [multiNode, upgradeSurvivor]) { |
| 572 | +expect(script).not.toContain('timeout "$DOCKER_RUN_TIMEOUT"'); |
| 573 | +} |
| 574 | +}); |
| 575 | + |
561 | 576 | it("keeps the harness run wrapper available with pre-sourced Docker command helpers", () => { |
562 | 577 | const workDir = mkdtempSync(join(tmpdir(), "openclaw-docker-package-helper-guard-")); |
563 | 578 | |
|
此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。 原文来自 — 版权归原作者所有。
