diff --git a/scripts/recover_ib_gateway_ready.sh b/scripts/recover_ib_gateway_ready.sh index 0c27f1b..d8b4fec 100755 --- a/scripts/recover_ib_gateway_ready.sh +++ b/scripts/recover_ib_gateway_ready.sh @@ -98,6 +98,10 @@ wait_for_ready_with_progress() { fi while [ "${extension}" -lt "${progress_extensions}" ]; do + if gateway_ui_blocker_present; then + stop_for_gateway_ui_blocker + fi + if ! gateway_recently_progressing; then return 1 fi diff --git a/tests/test_wait_for_ib_gateway_ready.sh b/tests/test_wait_for_ib_gateway_ready.sh index 7916d68..6fb4d76 100644 --- a/tests/test_wait_for_ib_gateway_ready.sh +++ b/tests/test_wait_for_ib_gateway_ready.sh @@ -49,6 +49,7 @@ test -x "$blocker_probe_script" grep -Fq -- '--check-gateway-ui-blocker' "$blocker_probe_script" grep -Fq 'gateway_ui_blocker_present()' "$recovery_script" grep -Fq 'GATEWAY_UI_BLOCKER: Gateway dialog requires account/login review' "$recovery_script" +grep -Fq 'if gateway_ui_blocker_present; then' "$recovery_script" grep -Fq 'skipping scheduled restart' "$daily_restart_script" tmp_dir="$(mktemp -d)"