@@ -440,13 +440,13 @@ NODE
440440return 0
441441fi
442442if ! kill -0 "$plugin_registry_pid" 2>/dev/null; then
443-cat "$log_file" >&2 || true
443+openclaw_e2e_print_log "$log_file" >&2
444444return 1
445445fi
446446 sleep 0.1
447447done
448448449-cat "$log_file" >&2 || true
449+openclaw_e2e_print_log "$log_file" >&2
450450echo "Timed out waiting for configured plugin install npm fixture registry." >&2
451451return 1
452452}
@@ -659,7 +659,7 @@ install_baseline() {
659659echo "Installing baseline package: $baseline_spec"
660660if ! openclaw_e2e_maybe_timeout "${OPENCLAW_E2E_NPM_INSTALL_TIMEOUT:-600s}" npm install -g --prefix "$npm_config_prefix" "$baseline_spec" --no-fund --no-audit >"$BASELINE_INSTALL_LOG" 2>&1; then
661661echo "baseline npm install failed" >&2
662-cat "$BASELINE_INSTALL_LOG" >&2 || true
662+openclaw_e2e_print_log "$BASELINE_INSTALL_LOG" >&2
663663return 1
664664fi
665665if ! command -v openclaw >/dev/null; then
@@ -713,7 +713,7 @@ apply_baseline_config_recipe() {
713713validate_baseline_config() {
714714if ! openclaw_e2e_maybe_timeout "$COMMAND_TIMEOUT" openclaw config validate >"$BASELINE_CONFIG_VALIDATE_LOG" 2>&1; then
715715echo "generated baseline config failed baseline validation" >&2
716-cat "$BASELINE_CONFIG_VALIDATE_LOG" >&2 || true
716+openclaw_e2e_print_log "$BASELINE_CONFIG_VALIDATE_LOG" >&2
717717return 1
718718fi
719719}
863863install_update_restart_service_unit() {
864864if ! openclaw_e2e_maybe_timeout "$COMMAND_TIMEOUT" env -u OPENCLAW_GATEWAY_TOKEN -u OPENCLAW_GATEWAY_PASSWORD openclaw gateway install --force --json >"$BASELINE_SERVICE_INSTALL_JSON" 2>"$BASELINE_SERVICE_INSTALL_ERR"; then
865865echo "baseline gateway service install failed" >&2
866-cat "$BASELINE_SERVICE_INSTALL_ERR" >&2 || true
867-cat "$BASELINE_SERVICE_INSTALL_JSON" >&2 || true
866+openclaw_e2e_print_log "$BASELINE_SERVICE_INSTALL_ERR" >&2
867+openclaw_e2e_print_log "$BASELINE_SERVICE_INSTALL_JSON" >&2
868868return 1
869869fi
870870}
@@ -1111,8 +1111,8 @@ update_candidate() {
11111111fi
11121112if ! openclaw_e2e_maybe_timeout "$COMMAND_TIMEOUT" "${update_env[@]}" openclaw "${update_args[@]}" >"$UPDATE_JSON" 2>"$UPDATE_ERR"; then
11131113echo "openclaw update failed" >&2
1114-cat "$UPDATE_ERR" >&2 || true
1115-cat "$UPDATE_JSON" >&2 || true
1114+openclaw_e2e_print_log "$UPDATE_ERR" >&2
1115+openclaw_e2e_print_log "$UPDATE_JSON" >&2
11161116return 1
11171117fi
11181118if [ "$UPDATE_RESTART_MODE" = "auto-auth" ]; then
@@ -1140,15 +1140,15 @@ assert_root_managed_vps_cli_usable() {
11401140run_doctor() {
11411141if ! openclaw_e2e_maybe_timeout "$COMMAND_TIMEOUT" openclaw doctor --fix --non-interactive >"$DOCTOR_LOG" 2>&1; then
11421142echo "openclaw doctor failed" >&2
1143-cat "$DOCTOR_LOG" >&2 || true
1143+openclaw_e2e_print_log "$DOCTOR_LOG" >&2
11441144return 1
11451145fi
11461146}
1147114711481148validate_post_doctor_config() {
11491149if ! openclaw_e2e_maybe_timeout "$COMMAND_TIMEOUT" openclaw config validate >>"$DOCTOR_LOG" 2>&1; then
11501150echo "post-doctor config validation failed" >&2
1151-cat "$DOCTOR_LOG" >&2 || true
1151+openclaw_e2e_print_log "$DOCTOR_LOG" >&2
11521152return 1
11531153fi
11541154}
@@ -1203,7 +1203,7 @@ start_gateway() {
12031203 start_seconds=$(((ready_epoch - start_epoch + 999) / 1000))
12041204if [ "$start_seconds" -gt "$budget" ]; then
12051205echo "gateway startup exceeded survivor budget: ${start_seconds}s > ${budget}s" >&2
1206-cat "$GATEWAY_LOG" >&2 || true
1206+openclaw_e2e_print_log "$GATEWAY_LOG" >&2
12071207return 1
12081208fi
12091209}
@@ -1228,15 +1228,15 @@ check_gateway_status() {
12281228 status_start="$(node -e "process.stdout.write(String(Date.now()))")"
12291229if ! openclaw_e2e_maybe_timeout "$COMMAND_TIMEOUT" openclaw gateway status --url "ws://127.0.0.1:$port" --token "$GATEWAY_AUTH_TOKEN_REF" --require-rpc --timeout 30000 --json >"$STATUS_JSON" 2>"$STATUS_ERR"; then
12301230echo "gateway status failed" >&2
1231-cat "$STATUS_ERR" >&2 || true
1232-cat "$GATEWAY_LOG" >&2 || true
1231+openclaw_e2e_print_log "$STATUS_ERR" >&2
1232+openclaw_e2e_print_log "$GATEWAY_LOG" >&2
12331233return 1
12341234fi
12351235 status_end="$(node -e "process.stdout.write(String(Date.now()))")"
12361236 status_seconds=$(((status_end - status_start + 999) / 1000))
12371237if [ "$status_seconds" -gt "$budget" ]; then
12381238echo "gateway status exceeded survivor budget: ${status_seconds}s > ${budget}s" >&2
1239-cat "$STATUS_JSON" >&2 || true
1239+openclaw_e2e_print_log "$STATUS_JSON" >&2
12401240return 1
12411241fi
12421242 node scripts/e2e/lib/upgrade-survivor/assertions.mjs assert-status-json "$STATUS_JSON"
此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。 原文来自 — 版权归原作者所有。