fix(haos): bound beta image reconnects

Author: kingpanther13

tests/haos_image_build/build_image.py

@@ -2033,7 +2033,7 @@ def _wait_core_version(
 
     while time.monotonic() < deadline:
         try:
-            ws.reconnect()
+            ws.reconnect(deadline=deadline)
             last_info = ws.supervisor_api("/core/info", method="get", timeout=30.0)
         except _SUPERVISOR_WAIT_TRANSIENT_ERRORS as exc:
             if not _is_transient_supervisor_readiness_error(exc):
@@ -2062,10 +2062,11 @@ def _reconnect_during_supervisor_update(
     ws: HAWebSocket,
     *,
     context: str,
+    deadline: float,
 ) -> BaseException | None:
     """Best-effort reconnect during a Supervisor restart window."""
     try:
-        ws.reconnect()
+        ws.reconnect(deadline=deadline)
     except _SUPERVISOR_WAIT_TRANSIENT_ERRORS as exc:
         if not _is_transient_supervisor_readiness_error(exc):
             raise
@@ -2097,6 +2098,7 @@ def _wait_supervisor_channel_metadata(
             reconnect_error = _reconnect_during_supervisor_update(
                 ws,
                 context="during Supervisor channel reload",
+                deadline=deadline,
             )
             if reconnect_error is not None:
                 last_error = reconnect_error
@@ -2168,6 +2170,7 @@ def _apply_supervisor_image_update(
             _reconnect_during_supervisor_update(
                 ws,
                 context="after Supervisor update",
+                deadline=deadline,
             )
             time.sleep(5.0)
 

tests/src/unit/test_haos_supervisor_wait.py

@@ -23,6 +23,7 @@
     OAuthCredentials,
     WSCommandError,
     _configure_supervisor_image_variant,
+    _reconnect_during_supervisor_update,
     _wait_core_version,
     _wait_supervisor_channel_metadata,
     _wait_supervisor_ready,
@@ -633,6 +634,24 @@ def test_channel_metadata_timeout_prefers_the_last_reconnect_error() -> None:
             deadline=1.0,
         )
 
+    ws.reconnect.assert_called_once_with(deadline=1.0)
+
+
+def test_supervisor_update_reconnect_propagates_deadline() -> None:
+    """Supervisor update reconnects retain the image-build deadline."""
+    ws = Mock()
+
+    assert (
+        _reconnect_during_supervisor_update(
+            ws,
+            context="during test",
+            deadline=10.0,
+        )
+        is None
+    )
+
+    ws.reconnect.assert_called_once_with(deadline=10.0)
+
 
 def test_wait_rejects_terminal_supervisor_error_without_retry() -> None:
     """A terminal Supervisor command error propagates immediately."""
@@ -1183,7 +1202,7 @@ def test_wait_core_version_reports_non_convergence() -> None:
     message = str(exc_info.value)
     assert "expected='2026.8.3'" in message
     assert repr(old_info) in message
-    ws.reconnect.assert_called_once_with()
+    ws.reconnect.assert_called_once_with(deadline=1.0)
     ws.supervisor_api.assert_called_once_with("/core/info", method="get", timeout=30.0)
     sleep.assert_called_once_with(0.0)