@@ -135,7 +135,7 @@ run_flow() {
135135 openclaw_test_state_create "switch-${name}" empty
136136export USER="testuser"
137137138-if ! timeout "$command_timeout" bash -c "$install_cmd" >"$install_log" 2>&1; then
138+if ! openclaw_e2e_maybe_timeout "$command_timeout" bash -c "$install_cmd" >"$install_log" 2>&1; then
139139 cat "$install_log"
140140exit 1
141141fi
@@ -149,7 +149,7 @@ run_flow() {
149149fi
150150 assert_entrypoint "$unit_path" "$install_expected"
151151152-if ! timeout "$command_timeout" bash -c "$doctor_cmd" >"$doctor_log" 2>&1; then
152+if ! openclaw_e2e_maybe_timeout "$command_timeout" bash -c "$doctor_cmd" >"$doctor_log" 2>&1; then
153153 cat "$doctor_log"
154154exit 1
155155fi
@@ -182,7 +182,7 @@ run_proxy_env_flow() {
182182export USER="testuser"
183183184184 unit_path="$HOME/.config/systemd/user/openclaw-gateway.service"
185-if ! timeout "$command_timeout" env \
185+if ! openclaw_e2e_maybe_timeout "$command_timeout" env \
186186 HTTP_PROXY="http://proxy.local:7890" \
187187 HTTPS_PROXY="https://proxy.local:7890" \
188188 NO_PROXY="localhost,127.0.0.1" \
@@ -198,7 +198,7 @@ run_proxy_env_flow() {
198198printf "%s\n" "Environment=HTTP_PROXY=http://stale-proxy.local:7890"
199199printf "%s\n" "Environment=HTTPS_PROXY=https://stale-proxy.local:7890"
200200 } >>"$unit_path"
201-if ! timeout "$command_timeout" env OPENCLAW_UPDATE_IN_PROGRESS=1 \
201+if ! openclaw_e2e_maybe_timeout "$command_timeout" env OPENCLAW_UPDATE_IN_PROGRESS=1 \
202202 node "$git_cli" doctor --repair --force --yes --non-interactive >"$doctor_log" 2>&1; then
203203 cat "$doctor_log"
204204exit 1
@@ -230,15 +230,15 @@ run_wrapper_flow() {
230230231231local unit_path="$HOME/.config/systemd/user/openclaw-gateway.service"
232232233-if ! timeout "$command_timeout" "$npm_bin" gateway install --wrapper "$wrapper" --force >"$install_log" 2>&1; then
233+if ! openclaw_e2e_maybe_timeout "$command_timeout" "$npm_bin" gateway install --wrapper "$wrapper" --force >"$install_log" 2>&1; then
234234 cat "$install_log"
235235exit 1
236236fi
237237 assert_exec_arg "$unit_path" 1 "$wrapper"
238238 assert_exec_arg "$unit_path" 2 "gateway"
239239 assert_env_value "$unit_path" "OPENCLAW_WRAPPER" "$wrapper"
240240241-if ! timeout "$command_timeout" "$npm_bin" gateway install --force >"$reinstall_log" 2>&1; then
241+if ! openclaw_e2e_maybe_timeout "$command_timeout" "$npm_bin" gateway install --force >"$reinstall_log" 2>&1; then
242242 cat "$reinstall_log"
243243exit 1
244244fi
@@ -247,22 +247,22 @@ run_wrapper_flow() {
247247 assert_env_value "$unit_path" "OPENCLAW_WRAPPER" "$wrapper"
248248249249 sed -i "/^Environment=OPENCLAW_WRAPPER=/d" "$unit_path"
250-if ! timeout "$command_timeout" "$npm_bin" gateway install --wrapper "$wrapper" >"$env_repair_log" 2>&1; then
250+if ! openclaw_e2e_maybe_timeout "$command_timeout" "$npm_bin" gateway install --wrapper "$wrapper" >"$env_repair_log" 2>&1; then
251251 cat "$env_repair_log"
252252exit 1
253253fi
254254 assert_exec_arg "$unit_path" 1 "$wrapper"
255255 assert_env_value "$unit_path" "OPENCLAW_WRAPPER" "$wrapper"
256256257257 sed -i "s#^Environment=OPENCLAW_WRAPPER=.*#Environment=OPENCLAW_WRAPPER=/tmp/stale-openclaw-wrapper#" "$unit_path"
258-if ! timeout "$command_timeout" "$npm_bin" gateway install --wrapper "$wrapper" >"$env_repair_log" 2>&1; then
258+if ! openclaw_e2e_maybe_timeout "$command_timeout" "$npm_bin" gateway install --wrapper "$wrapper" >"$env_repair_log" 2>&1; then
259259 cat "$env_repair_log"
260260exit 1
261261fi
262262 assert_exec_arg "$unit_path" 1 "$wrapper"
263263 assert_env_value "$unit_path" "OPENCLAW_WRAPPER" "$wrapper"
264264265-if ! timeout "$command_timeout" node "$git_cli" doctor --repair --force --yes >"$doctor_log" 2>&1; then
265+if ! openclaw_e2e_maybe_timeout "$command_timeout" node "$git_cli" doctor --repair --force --yes >"$doctor_log" 2>&1; then
266266 cat "$doctor_log"
267267exit 1
268268fi
@@ -274,7 +274,7 @@ run_wrapper_flow() {
274274 assert_exec_arg "$unit_path" 1 "$wrapper"
275275 assert_env_value "$unit_path" "OPENCLAW_WRAPPER" "$wrapper"
276276277-if ! timeout "$command_timeout" env OPENCLAW_WRAPPER= "$npm_bin" gateway install --force >"$clear_log" 2>&1; then
277+if ! openclaw_e2e_maybe_timeout "$command_timeout" env OPENCLAW_WRAPPER= "$npm_bin" gateway install --force >"$clear_log" 2>&1; then
278278 cat "$clear_log"
279279exit 1
280280fi
此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。 原文来自 — 版权归原作者所有。