fix(e2e): extend kitchen rpc watchdog · openclaw/openclaw@eedb667
vincentkoc
·
2026-06-19
·
via Recent Commits to openclaw:main
| Original file line number | Diff line number | Diff line change |
|---|
@@ -7,7 +7,9 @@ source "$ROOT_DIR/scripts/lib/docker-e2e-image.sh"
|
7 | 7 | IMAGE_NAME="$(docker_e2e_resolve_image "openclaw-kitchen-sink-rpc-e2e" OPENCLAW_KITCHEN_SINK_RPC_E2E_IMAGE)" |
8 | 8 | MAX_MEMORY_MIB="$(docker_e2e_read_nonnegative_decimal_env OPENCLAW_KITCHEN_SINK_MAX_MEMORY_MIB 2048)" |
9 | 9 | MAX_CPU_PERCENT="$(docker_e2e_read_nonnegative_decimal_env OPENCLAW_KITCHEN_SINK_MAX_CPU_PERCENT 1200)" |
10 | | -DOCKER_RUN_TIMEOUT="${OPENCLAW_KITCHEN_SINK_RPC_DOCKER_RUN_TIMEOUT:-900s}" |
| 10 | +# Keep the outer Docker watchdog above the walker's install, enable, inspect, |
| 11 | +# readiness, and first-RPC retry budgets so inner failures stay diagnostic. |
| 12 | +DOCKER_RUN_TIMEOUT="${OPENCLAW_KITCHEN_SINK_RPC_DOCKER_RUN_TIMEOUT:-1500s}" |
11 | 13 | CONTAINER_NAME="openclaw-kitchen-sink-rpc-e2e-$$" |
12 | 14 | RUN_LOG="$(mktemp "${TMPDIR:-/tmp}/openclaw-kitchen-sink-rpc.XXXXXX")" |
13 | 15 | STATS_LOG="$(mktemp "${TMPDIR:-/tmp}/openclaw-kitchen-sink-rpc-stats.XXXXXX")" |
|
| Original file line number | Diff line number | Diff line change |
|---|
@@ -255,7 +255,7 @@ function kitchenSinkRpcLane() {
|
255 | 255 | { |
256 | 256 | resources: ["npm"], |
257 | 257 | stateScenario: "empty", |
258 | | -timeoutMs: 15 * 60 * 1000, |
| 258 | +timeoutMs: 25 * 60 * 1000, |
259 | 259 | weight: 3, |
260 | 260 | }, |
261 | 261 | ); |
@@ -521,17 +521,13 @@ export const mainLanes = [
|
521 | 521 | lane("commitments-safety", "OPENCLAW_SKIP_DOCKER_BUILD=1 pnpm test:docker:commitments-safety", { |
522 | 522 | stateScenario: "empty", |
523 | 523 | }), |
524 | | -liveLane( |
525 | | -"npm-telegram-live", |
526 | | -"OPENCLAW_SKIP_DOCKER_BUILD=1 pnpm test:docker:npm-telegram-live", |
527 | | -{ |
528 | | -e2eImageKind: "bare", |
529 | | -provider: "openai", |
530 | | -resources: ["live:telegram", "npm", "service"], |
531 | | -timeoutMs: 30 * 60 * 1000, |
532 | | -weight: 3, |
533 | | -}, |
534 | | -), |
| 524 | +liveLane("npm-telegram-live", "OPENCLAW_SKIP_DOCKER_BUILD=1 pnpm test:docker:npm-telegram-live", { |
| 525 | +e2eImageKind: "bare", |
| 526 | +provider: "openai", |
| 527 | +resources: ["live:telegram", "npm", "service"], |
| 528 | +timeoutMs: 30 * 60 * 1000, |
| 529 | +weight: 3, |
| 530 | +}), |
535 | 531 | lane("qr", "pnpm test:docker:qr"), |
536 | 532 | ]; |
537 | 533 | |
|
| Original file line number | Diff line number | Diff line change |
|---|
@@ -3580,6 +3580,14 @@ output="$(cat "$sampler_log")"
|
3580 | 3580 | expect(missing).toEqual([]); |
3581 | 3581 | }); |
3582 | 3582 | |
| 3583 | +it("keeps the kitchen-sink RPC Docker watchdog above the internal walk budgets", () => { |
| 3584 | +const runner = readFileSync(KITCHEN_SINK_RPC_DOCKER_E2E_PATH, "utf8"); |
| 3585 | + |
| 3586 | +expect(runner).toContain( |
| 3587 | +'DOCKER_RUN_TIMEOUT="${OPENCLAW_KITCHEN_SINK_RPC_DOCKER_RUN_TIMEOUT:-1500s}"', |
| 3588 | +); |
| 3589 | +}); |
| 3590 | + |
3583 | 3591 | it("bounds kitchen-sink plugin CLI commands inside the Docker sweep", () => { |
3584 | 3592 | const runner = readFileSync(KITCHEN_SINK_PLUGIN_DOCKER_E2E_PATH, "utf8"); |
3585 | 3593 | const sweep = readFileSync("scripts/e2e/lib/kitchen-sink-plugin/sweep.sh", "utf8"); |
|
| Original file line number | Diff line number | Diff line change |
|---|
@@ -397,7 +397,7 @@ describe("scripts/lib/docker-e2e-plan", () => {
|
397 | 397 | name: "kitchen-sink-rpc", |
398 | 398 | resources: ["docker", "service", "npm"], |
399 | 399 | stateScenario: "empty", |
400 | | -timeoutMs: 900_000, |
| 400 | +timeoutMs: 1_500_000, |
401 | 401 | weight: 3, |
402 | 402 | }, |
403 | 403 | { |
|
此内容由惯性聚合(RSS阅读器)自动聚合整理,仅供阅读参考。 原文来自 — 版权归原作者所有。