fix(updater): fail-fast Spoolman health check, no double start, hold overlay until fresh status

Author: gmmcosta15

BlocksScreen/lib/panels/widgets/MainWindow/updatePage.py

@@ -340,6 +340,7 @@ def handle_status_ready(self, json_str: str) -> None:
                 _log.debug("status_ready: emitting call_load_panel(False)")
                 self.call_load_panel.emit(False, "", False)
                 self._post_update_status_pending = False
+                self._overlay_shown = False
         else:
             _log.debug("status_ready: skipping loadscreen dismiss (busy=True)")
         self.build_cards()
@@ -370,10 +371,18 @@ def handle_busy_changed(self, busy: bool) -> None:
                 # Keep the overlay up: SIGTERM is imminent, MainWindow would flash.
                 QtCore.QTimer.singleShot(15000, self._dismiss_after_restart_grace)
             elif self._overlay_shown:
-                self._overlay_shown = False
-                self.call_load_panel.emit(False, "", False)
+                # Hold the overlay until fresh status lands, else stale cards flash.
+                self._post_update_status_pending = True
+                QtCore.QTimer.singleShot(10000, self._dismiss_stale_overlay)
             self._request_status_debounced()
 
+    def _dismiss_stale_overlay(self) -> None:
+        """Drop the overlay if the post-update status never arrived."""
+        if self._overlay_shown and not self._busy:
+            self._overlay_shown = False
+            self._post_update_status_pending = False
+            self.call_load_panel.emit(False, "", False)
+
     def _dismiss_after_restart_grace(self) -> None:
         """Drop the overlay if the expected UI restart never came."""
         if self._restart_pending and not self._busy:

tests/widgets/test_update_page_unit.py

@@ -11,8 +11,12 @@
 def page(qapp):
     """UpdatePage instance with all heavy UI deps mocked."""
     patches = [
-        patch("BlocksScreen.lib.panels.widgets.MainWindow.updatePage.LoadingOverlayWidget"),
-        patch("BlocksScreen.lib.panels.widgets.MainWindow.updatePage.BlocksCustomButton"),
+        patch(
+            "BlocksScreen.lib.panels.widgets.MainWindow.updatePage.LoadingOverlayWidget"
+        ),
+        patch(
+            "BlocksScreen.lib.panels.widgets.MainWindow.updatePage.BlocksCustomButton"
+        ),
         patch("BlocksScreen.lib.panels.widgets.MainWindow.updatePage.IconButton"),
     ]
     for p in patches:
@@ -307,12 +311,22 @@ def test_false_does_not_emit_call_load_panel_when_no_overlay(self, page, qtbot):
         with qtbot.assertNotEmitted(page.call_load_panel, wait=200):
             page.handle_busy_changed(False)
 
-    def test_false_emits_call_load_panel_when_overlay_shown(self, page, qtbot):
+    def test_false_holds_overlay_until_status_ready(self, page, qtbot):
         page.show_loading = MagicMock()
         page._overlay_shown = True
-        with qtbot.waitSignal(page.call_load_panel, timeout=200) as blocker:
+        with qtbot.assertNotEmitted(page.call_load_panel, wait=200):
             page.handle_busy_changed(False)
-        assert blocker.args == [False, "",False]
+        assert page._overlay_shown is True
+        with qtbot.waitSignal(page.call_load_panel, timeout=200) as blocker:
+            page.handle_status_ready(_make_payload())
+        assert blocker.args == [False, "", False]
+        assert page._overlay_shown is False
+
+    def test_stale_overlay_fallback_dismisses(self, page, qtbot):
+        page._overlay_shown = True
+        page._busy = False
+        with qtbot.waitSignal(page.call_load_panel, timeout=200):
+            page._dismiss_stale_overlay()
         assert page._overlay_shown is False
 
     def test_true_starts_elapsed_timer(self, page):
@@ -413,13 +427,13 @@ class TestHandleStepComplete:
     def test_emits_call_load_panel_with_step_message(self, page, qtbot):
         with qtbot.waitSignal(page.call_load_panel, timeout=200) as blocker:
             page.handle_step_complete("klipper", 1, 4)
-        assert blocker.args == [True, "klipper: fetching",False]
+        assert blocker.args == [True, "klipper: fetching", False]
         page._progress_label.setText.assert_called_with("Step 1/4")
 
     def test_unknown_steps_falls_back_to_working(self, page, qtbot):
         with qtbot.waitSignal(page.call_load_panel, timeout=200) as blocker:
             page.handle_step_complete("moonraker", 99, 4)
-        assert blocker.args == [True, "moonraker: working",False]
+        assert blocker.args == [True, "moonraker: working", False]
         page._progress_label.setText.assert_called_with("Step 99/4")
 
 
@@ -498,7 +512,9 @@ def test_bad_payload_keeps_statuses_and_toasts(self, page):
 
 class TestConfirmPopupCleanup:
     def test_second_confirm_deletes_previous_popup(self, page):
-        with patch("BlocksScreen.lib.panels.widgets.MainWindow.updatePage.BasePopup") as popup_cls:
+        with patch(
+            "BlocksScreen.lib.panels.widgets.MainWindow.updatePage.BasePopup"
+        ) as popup_cls:
             first = MagicMock()
             second = MagicMock()
             popup_cls.side_effect = [first, second]