From d63d154457eecbe9b53e37b03d01ea217432ed91 Mon Sep 17 00:00:00 2001 From: Fredrik Erlandsson Date: Sun, 5 Oct 2025 22:18:31 +0200 Subject: [PATCH] Daikin increase timeout (#153722) Co-authored-by: Franck Nijhof Co-authored-by: Josef Zweck --- homeassistant/components/daikin/__init__.py | 6 +++--- homeassistant/components/daikin/config_flow.py | 4 ++-- homeassistant/components/daikin/const.py | 2 +- homeassistant/components/daikin/coordinator.py | 4 ++-- tests/components/daikin/test_init.py | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/homeassistant/components/daikin/__init__.py b/homeassistant/components/daikin/__init__.py index 88a7b71e3ed..a96918747a2 100644 --- a/homeassistant/components/daikin/__init__.py +++ b/homeassistant/components/daikin/__init__.py @@ -23,7 +23,7 @@ from homeassistant.helpers.aiohttp_client import async_get_clientsession from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC from homeassistant.util.ssl import client_context_no_verify -from .const import KEY_MAC, TIMEOUT +from .const import KEY_MAC, TIMEOUT_SEC from .coordinator import DaikinConfigEntry, DaikinCoordinator _LOGGER = logging.getLogger(__name__) @@ -42,7 +42,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: DaikinConfigEntry) -> bo session = async_get_clientsession(hass) host = conf[CONF_HOST] try: - async with asyncio.timeout(TIMEOUT): + async with asyncio.timeout(TIMEOUT_SEC): device: Appliance = await DaikinFactory( host, session, @@ -53,7 +53,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: DaikinConfigEntry) -> bo ) _LOGGER.debug("Connection to %s successful", host) except TimeoutError as err: - _LOGGER.debug("Connection to %s timed out in 60 seconds", host) + _LOGGER.debug("Connection to %s timed out in %s seconds", host, TIMEOUT_SEC) raise ConfigEntryNotReady from err except ClientConnectionError as err: _LOGGER.debug("ClientConnectionError to %s", host) diff --git a/homeassistant/components/daikin/config_flow.py b/homeassistant/components/daikin/config_flow.py index f5febafc4dc..85ed0804c66 100644 --- a/homeassistant/components/daikin/config_flow.py +++ b/homeassistant/components/daikin/config_flow.py @@ -20,7 +20,7 @@ from homeassistant.helpers.aiohttp_client import async_get_clientsession from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo from homeassistant.util.ssl import client_context_no_verify -from .const import DOMAIN, KEY_MAC, TIMEOUT +from .const import DOMAIN, KEY_MAC, TIMEOUT_SEC _LOGGER = logging.getLogger(__name__) @@ -84,7 +84,7 @@ class FlowHandler(ConfigFlow, domain=DOMAIN): password = None try: - async with asyncio.timeout(TIMEOUT): + async with asyncio.timeout(TIMEOUT_SEC): device: Appliance = await DaikinFactory( host, async_get_clientsession(self.hass), diff --git a/homeassistant/components/daikin/const.py b/homeassistant/components/daikin/const.py index 690267e5c83..f093569ea54 100644 --- a/homeassistant/components/daikin/const.py +++ b/homeassistant/components/daikin/const.py @@ -24,4 +24,4 @@ ATTR_STATE_OFF = "off" KEY_MAC = "mac" KEY_IP = "ip" -TIMEOUT = 60 +TIMEOUT_SEC = 120 diff --git a/homeassistant/components/daikin/coordinator.py b/homeassistant/components/daikin/coordinator.py index 8e1713af5b2..9bd8d17bf48 100644 --- a/homeassistant/components/daikin/coordinator.py +++ b/homeassistant/components/daikin/coordinator.py @@ -9,7 +9,7 @@ from homeassistant.config_entries import ConfigEntry from homeassistant.core import HomeAssistant from homeassistant.helpers.update_coordinator import DataUpdateCoordinator -from .const import DOMAIN +from .const import DOMAIN, TIMEOUT_SEC _LOGGER = logging.getLogger(__name__) @@ -28,7 +28,7 @@ class DaikinCoordinator(DataUpdateCoordinator[None]): _LOGGER, config_entry=entry, name=device.values.get("name", DOMAIN), - update_interval=timedelta(seconds=60), + update_interval=timedelta(seconds=TIMEOUT_SEC), ) self.device = device diff --git a/tests/components/daikin/test_init.py b/tests/components/daikin/test_init.py index 2380d5ad798..54caa79539b 100644 --- a/tests/components/daikin/test_init.py +++ b/tests/components/daikin/test_init.py @@ -187,7 +187,7 @@ async def test_client_update_connection_error( type(mock_daikin).update_status.side_effect = ClientConnectionError - freezer.tick(timedelta(seconds=60)) + freezer.tick(timedelta(seconds=120)) async_fire_time_changed(hass) await hass.async_block_till_done()