Catch ConnectionResetError when updating data in Cert expiry integration (home-assistant#155149)

Author: bieniu

homeassistant/components/cert_expiry/config_flow.py

@@ -14,6 +14,7 @@
 from .const import DEFAULT_PORT, DOMAIN
 from .errors import (
     ConnectionRefused,
+    ConnectionReset,
     ConnectionTimeout,
     ResolveFailed,
     ValidationFailure,
@@ -49,6 +50,8 @@ async def _test_connection(
             self._errors[CONF_HOST] = "connection_timeout"
         except ConnectionRefused:
             self._errors[CONF_HOST] = "connection_refused"
+        except ConnectionReset:
+            self._errors[CONF_HOST] = "connection_reset"
         except ValidationFailure:
             return True
         else:

homeassistant/components/cert_expiry/errors.py

@@ -25,3 +25,7 @@ class ConnectionTimeout(TemporaryFailure):
 
 class ConnectionRefused(TemporaryFailure):
     """Network connection refused."""
+
+
+class ConnectionReset(TemporaryFailure):
+    """Network connection reset."""

homeassistant/components/cert_expiry/helper.py

@@ -13,6 +13,7 @@
 from .const import TIMEOUT
 from .errors import (
     ConnectionRefused,
+    ConnectionReset,
     ConnectionTimeout,
     ResolveFailed,
     ValidationFailure,
@@ -58,6 +59,8 @@ async def get_cert_expiry_timestamp(
         raise ConnectionRefused(
             f"Connection refused by server: {hostname}:{port}"
         ) from err
+    except ConnectionResetError as err:
+        raise ConnectionReset(f"Connection reset by server: {hostname}:{port}") from err
     except ssl.CertificateError as err:
         raise ValidationFailure(err.verify_message) from err
     except ssl.SSLError as err:

homeassistant/components/cert_expiry/strings.json

@@ -14,7 +14,8 @@
     "error": {
       "resolve_failed": "This host cannot be resolved",
       "connection_timeout": "Timeout when connecting to this host",
-      "connection_refused": "Connection refused when connecting to host"
+      "connection_refused": "Connection refused when connecting to host",
+      "connection_reset": "Connection reset when connecting to host"
     },
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_service%]",

tests/components/cert_expiry/test_config_flow.py

@@ -115,3 +115,13 @@ async def test_abort_on_socket_failed(hass: HomeAssistant) -> None:
         )
     assert result["type"] is FlowResultType.FORM
     assert result["errors"] == {CONF_HOST: "connection_refused"}
+
+    with patch(
+        "homeassistant.components.cert_expiry.helper.async_get_cert",
+        side_effect=ConnectionResetError,
+    ):
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"], user_input={CONF_HOST: HOST}
+        )
+    assert result["type"] is FlowResultType.FORM
+    assert result["errors"] == {CONF_HOST: "connection_reset"}