fix(e2e): kill timed docker helper commands · openclaw/openclaw@e89afa6

Recent Commits to openclaw:main

vincentkoc · 2026-05-26 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -3,17 +3,27 @@`
`3`	`3`	`# Shared helpers for Docker E2E scripts that keep a named container running`
`4`	`4`	`# while polling readiness from the host.`
`5`	`5`
`6`		`-docker_e2e_docker_cmd() {`
	`6`	`+docker_e2e_timeout_cmd() {`
	`7`	`+local timeout_value="$1"`
	`8`	`+shift`
`7`	`9`	`if command -v timeout >/dev/null 2>&1; then`
`8`		`- timeout "${DOCKER_COMMAND_TIMEOUT:-600s}" docker "$@"`
	`10`	`+if timeout --kill-after=1s 1s true >/dev/null 2>&1; then`
	`11`	`+ timeout --kill-after=30s "$timeout_value" "$@"`
	`12`	`+else`
	`13`	`+ timeout "$timeout_value" "$@"`
	`14`	`+fi`
`9`	`15`	`return`
`10`	`16`	`fi`
`11`		`- docker "$@"`
	`17`	`+"$@"`
	`18`	`+}`
	`19`	`+`
	`20`	`+docker_e2e_docker_cmd() {`
	`21`	`+ docker_e2e_timeout_cmd "${DOCKER_COMMAND_TIMEOUT:-600s}" docker "$@"`
`12`	`22`	`}`
`13`	`23`
`14`	`24`	`docker_e2e_docker_run_cmd() {`
`15`		`-if [ -n "${DOCKER_COMMAND_TIMEOUT:-}" ] && command -v timeout >/dev/null 2>&1; then`
`16`		`-timeout "$DOCKER_COMMAND_TIMEOUT" docker "$@"`
	`25`	`+if [ -n "${DOCKER_COMMAND_TIMEOUT:-}" ]; then`
	`26`	`+docker_e2e_timeout_cmd "$DOCKER_COMMAND_TIMEOUT" docker "$@"`
`17`	`27`	`return`
`18`	`28`	`fi`
`19`	`29`	`docker "$@"`

Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,16 @@ if ! declare -F docker_e2e_docker_cmd >/dev/null 2>&1; then`
`15`	`15`	`fi`
`16`	`16`	`if ! declare -F docker_e2e_docker_run_cmd >/dev/null 2>&1; then`
`17`	`17`	`docker_e2e_docker_run_cmd() {`
	`18`	`+if [ -n "${DOCKER_COMMAND_TIMEOUT:-}" ] && declare -F docker_e2e_timeout_cmd >/dev/null 2>&1; then`
	`19`	`+ docker_e2e_timeout_cmd "$DOCKER_COMMAND_TIMEOUT" docker "$@"`
	`20`	`+return`
	`21`	`+fi`
`18`	`22`	`if [ -n "${DOCKER_COMMAND_TIMEOUT:-}" ] && command -v timeout >/dev/null 2>&1; then`
`19`		`- timeout "$DOCKER_COMMAND_TIMEOUT" docker "$@"`
	`23`	`+if timeout --kill-after=1s 1s true >/dev/null 2>&1; then`
	`24`	`+ timeout --kill-after=30s "$DOCKER_COMMAND_TIMEOUT" docker "$@"`
	`25`	`+else`
	`26`	`+ timeout "$DOCKER_COMMAND_TIMEOUT" docker "$@"`
	`27`	`+fi`
`20`	`28`	`return`
`21`	`29`	`fi`
`22`	`30`	`docker "$@"`

Original file line number	Diff line number	Diff line change
`@@ -182,8 +182,19 @@ export OPENCLAW_SKIP_DOCKER_BUILD=1`
`182`	`182`	`mkdir -p "$TMPDIR/bin"`
`183`	`183`	`cat >"$TMPDIR/bin/timeout" <<'SH'`
`184`	`184`	`#!/usr/bin/env bash`
`185`		`-printf "%s\|%s\\n" "$1" "$2 $3 $4" >>"$TMPDIR/timeout-seen"`
`186`		`-shift`
	`185`	`+case "$1" in`
	`186`	`+ --kill-after=1s)`
	`187`	`+ exit 0`
	`188`	`+ ;;`
	`189`	`+ --kill-after=30s)`
	`190`	`+ printf "%s %s\|%s\\n" "$1" "$2" "$3 $4 $5" >>"$TMPDIR/timeout-seen"`
	`191`	`+ shift 2`
	`192`	`+ ;;`
	`193`	`+ *)`
	`194`	`+ printf "%s\|%s\\n" "$1" "$2 $3 $4" >>"$TMPDIR/timeout-seen"`
	`195`	`+ shift`
	`196`	`+ ;;`
	`197`	`+esac`
`187`	`198`	`"$@"`
`188`	`199`	`SH`
`189`	`200`	`chmod +x "$TMPDIR/bin/timeout"`
`@@ -214,7 +225,7 @@ docker_e2e_build_or_reuse \\`
`214`	`225`	`"$ROOT_DIR" \\`
`215`	`226`	`functional`
`216`	`227`
`217`		`-test "$(grep -c '^3s\|' "$TMPDIR/timeout-seen")" = "2"`
	`228`	`+test "$(grep -c '^--kill-after=30s 3s\|' "$TMPDIR/timeout-seen")" = "2"`
`218`	`229`	`grep -q '^image inspect openclaw-reuse-image$' "$TMPDIR/docker-seen"`
`219`	`230`	`grep -q '^pull openclaw-reuse-image$' "$TMPDIR/docker-seen"`
`220`	`231`	`;
`@@ -382,8 +393,19 @@ export DOCKER_COMMAND_TIMEOUT=3s`
`382`	`393`	`mkdir -p "$TMPDIR/bin"`
`383`	`394`	`cat >"$TMPDIR/bin/timeout" <<'SH'`
`384`	`395`	`#!/usr/bin/env bash`
`385`		`-printf "%s\\n" "$1" >"$TMPDIR/docker-timeout-seen"`
`386`		`-shift`
	`396`	`+case "$1" in`
	`397`	`+ --kill-after=1s)`
	`398`	`+ exit 0`
	`399`	`+ ;;`
	`400`	`+ --kill-after=30s)`
	`401`	`+ printf "%s %s\\n" "$1" "$2" >"$TMPDIR/docker-timeout-seen"`
	`402`	`+ shift 2`
	`403`	`+ ;;`
	`404`	`+ *)`
	`405`	`+ printf "%s\\n" "$1" >"$TMPDIR/docker-timeout-seen"`
	`406`	`+ shift`
	`407`	`+ ;;`
	`408`	`+esac`
`387`	`409`	`"$@"`
`388`	`410`	`SH`
`389`	`411`	`chmod +x "$TMPDIR/bin/timeout"`
`@@ -450,7 +472,7 @@ pack_dir="$(dirname "$package_tgz")"`
`450`	`472`	`docker_e2e_package_mount_args "$package_tgz"`
`451`	`473`	`DOCKER_STUB_STATUS=7 docker_e2e_run_with_harness image-name bash -lc true \|\| run_status="$?"`
`452`	`474`	`test "\${run_status:-0}" = "7"`
`453`		`-test "$(cat "$TMPDIR/docker-timeout-seen")" = "3s"`
	`475`	`+test "$(cat "$TMPDIR/docker-timeout-seen")" = "--kill-after=30s 3s"`
`454`	`476`	`test -f "$TMPDIR/package-mount-seen"`
`455`	`477`	`test ! -e "$pack_dir"`
`456`	`478`

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

推荐订阅源

Recent Commits to openclaw:main