From 2fbe352ad558f8db5ef4be0f5bafcdae3b1f82a8 Mon Sep 17 00:00:00 2001 From: Guido Schmitz Date: Tue, 30 Mar 2021 07:08:08 +0200 Subject: [PATCH] Make devolo home control more robust against connection losts (#48328) --- .../components/devolo_home_control/__init__.py | 2 +- .../components/devolo_home_control/manifest.json | 2 +- requirements_all.txt | 2 +- requirements_test_all.txt | 2 +- tests/components/devolo_home_control/test_init.py | 11 ----------- 5 files changed, 4 insertions(+), 15 deletions(-) diff --git a/homeassistant/components/devolo_home_control/__init__.py b/homeassistant/components/devolo_home_control/__init__.py index e6f802348cd..2fb31c6291c 100644 --- a/homeassistant/components/devolo_home_control/__init__.py +++ b/homeassistant/components/devolo_home_control/__init__.py @@ -49,7 +49,7 @@ async def async_setup_entry(hass: HomeAssistantType, entry: ConfigEntry) -> bool ) ) ) - except (ConnectionError, GatewayOfflineError) as err: + except GatewayOfflineError as err: raise ConfigEntryNotReady from err for platform in PLATFORMS: diff --git a/homeassistant/components/devolo_home_control/manifest.json b/homeassistant/components/devolo_home_control/manifest.json index 1ae8e9bbb59..93cf4be5d35 100644 --- a/homeassistant/components/devolo_home_control/manifest.json +++ b/homeassistant/components/devolo_home_control/manifest.json @@ -2,7 +2,7 @@ "domain": "devolo_home_control", "name": "devolo Home Control", "documentation": "https://www.home-assistant.io/integrations/devolo_home_control", - "requirements": ["devolo-home-control-api==0.17.0"], + "requirements": ["devolo-home-control-api==0.17.1"], "after_dependencies": ["zeroconf"], "config_flow": true, "codeowners": ["@2Fake", "@Shutgun"], diff --git a/requirements_all.txt b/requirements_all.txt index 0465f52c762..d0f1714da21 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -479,7 +479,7 @@ deluge-client==1.7.1 denonavr==0.9.10 # homeassistant.components.devolo_home_control -devolo-home-control-api==0.17.0 +devolo-home-control-api==0.17.1 # homeassistant.components.directv directv==0.4.0 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index 39d386574ad..6876aadbf2e 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -261,7 +261,7 @@ defusedxml==0.6.0 denonavr==0.9.10 # homeassistant.components.devolo_home_control -devolo-home-control-api==0.17.0 +devolo-home-control-api==0.17.1 # homeassistant.components.directv directv==0.4.0 diff --git a/tests/components/devolo_home_control/test_init.py b/tests/components/devolo_home_control/test_init.py index f45400716f8..3f124ee2098 100644 --- a/tests/components/devolo_home_control/test_init.py +++ b/tests/components/devolo_home_control/test_init.py @@ -39,17 +39,6 @@ async def test_setup_entry_maintenance(hass: HomeAssistant): assert entry.state == ENTRY_STATE_SETUP_RETRY -async def test_setup_connection_error(hass: HomeAssistant): - """Test setup entry fails on connection error.""" - entry = configure_integration(hass) - with patch( - "homeassistant.components.devolo_home_control.HomeControl", - side_effect=ConnectionError, - ): - await hass.config_entries.async_setup(entry.entry_id) - assert entry.state == ENTRY_STATE_SETUP_RETRY - - async def test_setup_gateway_offline(hass: HomeAssistant): """Test setup entry fails on gateway offline.""" entry = configure_integration(hass)