fix: stabilize windows parallels smoke harness

This commit is contained in:
Peter Steinberger 2026-03-15 22:41:30 -07:00
parent ad97c581e2
commit 0b58a1cc13
No known key found for this signature in database

View File

@ -371,9 +371,10 @@ phase_run() {
local timeout_s="$2"
shift 2
local log_path pid rc timed_out
local log_path pid start rc timed_out
log_path="$(phase_log_path "$phase_id")"
say "$phase_id"
start=$SECONDS
timed_out=0
(
@ -381,26 +382,22 @@ phase_run() {
) >"$log_path" 2>&1 &
pid=$!
(
sleep "$timeout_s"
kill "$pid" >/dev/null 2>&1 || true
sleep 2
kill -9 "$pid" >/dev/null 2>&1 || true
) &
local killer_pid=$!
while kill -0 "$pid" >/dev/null 2>&1; do
if (( SECONDS - start >= timeout_s )); then
timed_out=1
kill "$pid" >/dev/null 2>&1 || true
sleep 2
kill -9 "$pid" >/dev/null 2>&1 || true
break
fi
sleep 1
done
set +e
wait "$pid"
rc=$?
set -e
if kill -0 "$killer_pid" >/dev/null 2>&1; then
kill "$killer_pid" >/dev/null 2>&1 || true
wait "$killer_pid" >/dev/null 2>&1 || true
else
timed_out=1
fi
if (( timed_out )); then
warn "$phase_id timed out after ${timeout_s}s"
printf 'timeout after %ss\n' "$timeout_s" >>"$log_path"
@ -770,7 +767,7 @@ show_gateway_status_compat() {
}
verify_turn() {
guest_run_openclaw "" "" agent --agent main --message ping --json
guest_run_openclaw "" "" agent --agent main --message "Reply with exact ASCII text OK only." --json
}
capture_latest_ref_failure() {