refactor: extract remaining docker e2e scenarios · opencl...

Recent Commits to openclaw:main

steipete · 2026-04-29 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -118,26 +118,13 @@ NODE`
`118`	`118`	`openclaw_e2e_exec_gateway \"\$entry\" $PORT loopback /tmp/browser-cdp-gateway.log" >/dev/null`
`119`	`119`
`120`	`120`	`echo "Waiting for Chromium and Gateway..."`
`121`		`-ready=0`
`122`		`-for _ in $(seq 1 180); do`
`123`		`-if [ "$(docker_cmd docker inspect -f '{{.State.Running}}' "$CONTAINER_NAME" 2>/dev/null \|\| echo false)" != "true" ]; then`
`124`		`-break`
`125`		`-fi`
`126`		`-if docker_cmd docker exec "$CONTAINER_NAME" bash -lc "`
	`121`	`+if ! docker_e2e_wait_container_bash "$CONTAINER_NAME" 180 0.5 "`
`127`	`122`	`source scripts/lib/openclaw-e2e-instance.sh`
`128`	`123`	`openclaw_e2e_probe_http_status http://127.0.0.1:$CDP_PORT/json/version`
`129`	`124`	`openclaw_e2e_probe_tcp 127.0.0.1 $PORT`
`130`		`- " >/dev/null 2>&1; then`
`131`		`- ready=1`
`132`		`-break`
`133`		`-fi`
`134`		`- sleep 0.5`
`135`		`-done`
`136`		`-`
`137`		`-if [ "$ready" -ne 1 ]; then`
	`125`	`+"; then`
`138`	`126`	`echo "Browser CDP snapshot container failed to become ready"`
`139`		`- docker_cmd docker logs "$CONTAINER_NAME" 2>&1 \| tail -n 120 \|\| true`
`140`		`- docker_cmd docker exec "$CONTAINER_NAME" bash -lc "tail -n 120 /tmp/browser-cdp-chromium.log /tmp/browser-cdp-gateway.log /tmp/browser-cdp-fixture.log" \|\| true`
	`127`	`+ docker_e2e_tail_container_file_if_running "$CONTAINER_NAME" "/tmp/browser-cdp-chromium.log /tmp/browser-cdp-gateway.log /tmp/browser-cdp-fixture.log" 120`
`141`	`128`	`exit 1`
`142`	`129`	`fi`
`143`	`130`

Original file line number	Diff line number	Diff line change
`@@ -43,25 +43,9 @@ docker_cmd docker run -d \`
`43`	`43`	`bash -lc "set -euo pipefail; source scripts/lib/openclaw-e2e-instance.sh; entry=\"\$(openclaw_e2e_resolve_entrypoint)\"; node \"\$entry\" config set gateway.controlUi.enabled false >/dev/null; openclaw_e2e_exec_gateway \"\$entry\" $PORT lan /tmp/gateway-net-e2e.log" >/dev/null`
`44`	`44`
`45`	`45`	`echo "Waiting for gateway to come up..."`
`46`		`-ready=0`
`47`		`-for _ in $(seq 1 180); do`
`48`		`-if [ "$(docker_cmd docker inspect -f '{{.State.Running}}' "$GW_NAME" 2>/dev/null \|\| echo false)" != "true" ]; then`
`49`		`-break`
`50`		`-fi`
`51`		`-if docker_cmd docker exec "$GW_NAME" bash -lc "source scripts/lib/openclaw-e2e-instance.sh; openclaw_e2e_probe_tcp 127.0.0.1 $PORT \|\| grep -q \"listening on ws://\" /tmp/gateway-net-e2e.log 2>/dev/null"; then`
`52`		`- ready=1`
`53`		`-break`
`54`		`-fi`
`55`		`- sleep 0.5`
`56`		`-done`
`57`		`-`
`58`		`-if [ "$ready" -ne 1 ]; then`
	`46`	`+if ! docker_e2e_wait_container_bash "$GW_NAME" 180 0.5 "source scripts/lib/openclaw-e2e-instance.sh; openclaw_e2e_probe_tcp 127.0.0.1 $PORT \|\| grep -q \"listening on ws://\" /tmp/gateway-net-e2e.log 2>/dev/null"; then`
`59`	`47`	`echo "Gateway failed to start"`
`60`		`-if [ "$(docker_cmd docker inspect -f '{{.State.Running}}' "$GW_NAME" 2>/dev/null \|\| echo false)" = "true" ]; then`
`61`		`- docker_cmd docker exec "$GW_NAME" bash -lc "tail -n 80 /tmp/gateway-net-e2e.log" \|\| true`
`62`		`-else`
`63`		`- docker_cmd docker logs "$GW_NAME" 2>&1 \| tail -n 120 \|\| true`
`64`		`-fi`
	`48`	`+ docker_e2e_tail_container_file_if_running "$GW_NAME" /tmp/gateway-net-e2e.log 120`
`65`	`49`	`exit 1`
`66`	`50`	`fi`
`67`	`51`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main