Retry transient Home Assistant resets in E2E

Author: MinecraftFuns

scripts/e2e_home_assistant.py

@@ -3,12 +3,12 @@
 from __future__ import annotations
 
 import argparse
+import http.client
 import json
 import shutil
 import subprocess
 import tempfile
 import time
-import urllib.error
 import urllib.request
 import uuid
 from collections.abc import Mapping, Sequence
@@ -82,7 +82,7 @@ def wait_for_http(url: str, *, timeout: float) -> bytes:
                     if not isinstance(body, bytes):
                         raise TypeError("HTTP response body must be bytes")
                     return body
-        except (TimeoutError, urllib.error.URLError) as error:
+        except (OSError, http.client.HTTPException) as error:
             last_error = error
         time.sleep(1)
     raise TimeoutError(f"{url} did not become ready within {timeout}s: {last_error}")

tests/test_e2e_home_assistant.py

@@ -1,15 +1,38 @@
 import json
 from pathlib import Path
+from types import TracebackType
+from typing import Self
 
 import pytest
 
 from scripts.e2e_home_assistant import (
     addon_options,
     assetlink_sites,
+    wait_for_http,
     write_json,
 )
 
 
+class SuccessfulResponse:
+    """Minimal typed context manager matching the urllib response boundary."""
+
+    status = 200
+
+    def __enter__(self) -> Self:
+        return self
+
+    def __exit__(
+        self,
+        exception_type: type[BaseException] | None,
+        exception: BaseException | None,
+        traceback: TracebackType | None,
+    ) -> None:
+        return None
+
+    def read(self) -> bytes:
+        return b"ready"
+
+
 def test_addon_options_constructs_independent_serializable_values() -> None:
     sites = ["https://ha.example.com"]
 
@@ -49,3 +72,23 @@ def test_write_json_replaces_document_deterministically(tmp_path: Path) -> None:
 
     assert destination.read_text(encoding="utf-8") == ('{\n  "a": true,\n  "z": 1\n}\n')
     assert not destination.with_suffix(".json.tmp").exists()
+
+
+def test_wait_for_http_retries_connection_reset(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    attempts = 0
+
+    def open_with_startup_reset(url: str, *, timeout: float) -> SuccessfulResponse:
+        nonlocal attempts
+        del url, timeout
+        attempts += 1
+        if attempts == 1:
+            raise ConnectionResetError("service is still starting")
+        return SuccessfulResponse()
+
+    monkeypatch.setattr("urllib.request.urlopen", open_with_startup_reset)
+    monkeypatch.setattr("time.sleep", lambda _seconds: None)
+
+    assert wait_for_http("http://home-assistant.test", timeout=1) == b"ready"
+    assert attempts == 2