From ae39945a8592cc3128b7eb34434803f4b8849cbf Mon Sep 17 00:00:00 2001 From: Erik Montnemery Date: Thu, 15 Feb 2024 20:52:40 +0100 Subject: [PATCH] Correct config entry setup in fritz tests (#110669) --- tests/components/fritz/test_button.py | 5 ++--- tests/components/fritz/test_diagnostics.py | 3 +-- tests/components/fritz/test_image.py | 7 +++---- tests/components/fritz/test_init.py | 9 ++++----- tests/components/fritz/test_sensor.py | 5 ++--- tests/components/fritz/test_switch.py | 3 +-- tests/components/fritz/test_update.py | 9 ++++----- 7 files changed, 17 insertions(+), 24 deletions(-) diff --git a/tests/components/fritz/test_button.py b/tests/components/fritz/test_button.py index 1dcf14d4b4c..e375cd4f047 100644 --- a/tests/components/fritz/test_button.py +++ b/tests/components/fritz/test_button.py @@ -8,7 +8,6 @@ from homeassistant.components.fritz.const import DOMAIN from homeassistant.config_entries import ConfigEntryState from homeassistant.const import ATTR_ENTITY_ID, STATE_UNKNOWN from homeassistant.core import HomeAssistant -from homeassistant.setup import async_setup_component from .const import MOCK_USER_DATA @@ -21,7 +20,7 @@ async def test_button_setup(hass: HomeAssistant, fc_class_mock, fh_class_mock) - entry = MockConfigEntry(domain=DOMAIN, data=MOCK_USER_DATA) entry.add_to_hass(hass) - assert await async_setup_component(hass, DOMAIN, {}) + await hass.config_entries.async_setup(entry.entry_id) await hass.async_block_till_done() assert entry.state == ConfigEntryState.LOADED @@ -52,7 +51,7 @@ async def test_buttons( entry = MockConfigEntry(domain=DOMAIN, data=MOCK_USER_DATA) entry.add_to_hass(hass) - assert await async_setup_component(hass, DOMAIN, {}) + await hass.config_entries.async_setup(entry.entry_id) await hass.async_block_till_done() assert entry.state == ConfigEntryState.LOADED diff --git a/tests/components/fritz/test_diagnostics.py b/tests/components/fritz/test_diagnostics.py index 9751e25de72..9f50a598039 100644 --- a/tests/components/fritz/test_diagnostics.py +++ b/tests/components/fritz/test_diagnostics.py @@ -7,7 +7,6 @@ from homeassistant.components.fritz.const import DOMAIN from homeassistant.components.fritz.diagnostics import TO_REDACT from homeassistant.config_entries import ConfigEntryState from homeassistant.core import HomeAssistant -from homeassistant.setup import async_setup_component from .const import MOCK_MESH_MASTER_MAC, MOCK_USER_DATA @@ -26,7 +25,7 @@ async def test_entry_diagnostics( entry = MockConfigEntry(domain=DOMAIN, data=MOCK_USER_DATA) entry.add_to_hass(hass) - assert await async_setup_component(hass, DOMAIN, {}) + await hass.config_entries.async_setup(entry.entry_id) await hass.async_block_till_done() assert entry.state == ConfigEntryState.LOADED diff --git a/tests/components/fritz/test_image.py b/tests/components/fritz/test_image.py index da5b8a76d27..bd75676da6c 100644 --- a/tests/components/fritz/test_image.py +++ b/tests/components/fritz/test_image.py @@ -13,7 +13,6 @@ from homeassistant.config_entries import ConfigEntryState from homeassistant.const import STATE_UNKNOWN, Platform from homeassistant.core import HomeAssistant from homeassistant.helpers.entity_registry import async_get as async_get_entity_registry -from homeassistant.setup import async_setup_component from homeassistant.util.dt import utcnow from .const import MOCK_FB_SERVICES, MOCK_USER_DATA @@ -102,7 +101,7 @@ async def test_image_entity( ): entry = MockConfigEntry(domain=DOMAIN, data=MOCK_USER_DATA) entry.add_to_hass(hass) - assert await async_setup_component(hass, DOMAIN, {}) + await hass.config_entries.async_setup(entry.entry_id) await hass.async_block_till_done() assert entry.state == ConfigEntryState.LOADED @@ -152,7 +151,7 @@ async def test_image_update( ): entry = MockConfigEntry(domain=DOMAIN, data=MOCK_USER_DATA) entry.add_to_hass(hass) - assert await async_setup_component(hass, DOMAIN, {}) + await hass.config_entries.async_setup(entry.entry_id) await hass.async_block_till_done() assert entry.state == ConfigEntryState.LOADED @@ -188,7 +187,7 @@ async def test_image_update_unavailable( ): entry = MockConfigEntry(domain=DOMAIN, data=MOCK_USER_DATA) entry.add_to_hass(hass) - assert await async_setup_component(hass, DOMAIN, {}) + await hass.config_entries.async_setup(entry.entry_id) await hass.async_block_till_done() assert entry.state == ConfigEntryState.LOADED diff --git a/tests/components/fritz/test_init.py b/tests/components/fritz/test_init.py index 816af6709d6..2e230eb61a6 100644 --- a/tests/components/fritz/test_init.py +++ b/tests/components/fritz/test_init.py @@ -14,7 +14,6 @@ from homeassistant.components.fritz.const import ( ) from homeassistant.config_entries import ConfigEntryState from homeassistant.core import HomeAssistant -from homeassistant.setup import async_setup_component from .const import MOCK_USER_DATA @@ -27,7 +26,7 @@ async def test_setup(hass: HomeAssistant, fc_class_mock, fh_class_mock) -> None: entry = MockConfigEntry(domain=DOMAIN, data=MOCK_USER_DATA) entry.add_to_hass(hass) - assert await async_setup_component(hass, DOMAIN, {}) + await hass.config_entries.async_setup(entry.entry_id) await hass.async_block_till_done() assert entry.state == ConfigEntryState.LOADED @@ -51,7 +50,7 @@ async def test_options_reload( "homeassistant.config_entries.ConfigEntries.async_reload", return_value=None, ) as mock_reload: - assert await async_setup_component(hass, DOMAIN, {}) + await hass.config_entries.async_setup(entry.entry_id) await hass.async_block_till_done() assert entry.state == ConfigEntryState.LOADED @@ -79,7 +78,7 @@ async def test_setup_auth_fail(hass: HomeAssistant, error) -> None: "homeassistant.components.fritz.common.FritzConnection", side_effect=error, ): - assert await async_setup_component(hass, DOMAIN, {}) + await hass.config_entries.async_setup(entry.entry_id) await hass.async_block_till_done() assert entry.state == ConfigEntryState.SETUP_ERROR @@ -99,7 +98,7 @@ async def test_setup_fail(hass: HomeAssistant, error) -> None: "homeassistant.components.fritz.common.FritzConnection", side_effect=error, ): - assert await async_setup_component(hass, DOMAIN, {}) + await hass.config_entries.async_setup(entry.entry_id) await hass.async_block_till_done() assert entry.state == ConfigEntryState.SETUP_RETRY diff --git a/tests/components/fritz/test_sensor.py b/tests/components/fritz/test_sensor.py index b2f389627ac..eefa65274d7 100644 --- a/tests/components/fritz/test_sensor.py +++ b/tests/components/fritz/test_sensor.py @@ -23,7 +23,6 @@ from homeassistant.const import ( STATE_UNAVAILABLE, ) from homeassistant.core import HomeAssistant -from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util from .const import MOCK_USER_DATA @@ -120,7 +119,7 @@ async def test_sensor_setup(hass: HomeAssistant, fc_class_mock, fh_class_mock) - entry = MockConfigEntry(domain=DOMAIN, data=MOCK_USER_DATA) entry.add_to_hass(hass) - assert await async_setup_component(hass, DOMAIN, {}) + await hass.config_entries.async_setup(entry.entry_id) await hass.async_block_till_done() assert entry.state == ConfigEntryState.LOADED @@ -144,7 +143,7 @@ async def test_sensor_update_fail( entry = MockConfigEntry(domain=DOMAIN, data=MOCK_USER_DATA) entry.add_to_hass(hass) - assert await async_setup_component(hass, DOMAIN, {}) + await hass.config_entries.async_setup(entry.entry_id) await hass.async_block_till_done() fc_class_mock().call_action_side_effect(FritzConnectionException) diff --git a/tests/components/fritz/test_switch.py b/tests/components/fritz/test_switch.py index 7640f336872..c8288f0143f 100644 --- a/tests/components/fritz/test_switch.py +++ b/tests/components/fritz/test_switch.py @@ -7,7 +7,6 @@ from homeassistant.components.fritz.const import DOMAIN from homeassistant.config_entries import ConfigEntryState from homeassistant.const import Platform from homeassistant.core import HomeAssistant -from homeassistant.setup import async_setup_component from .const import MOCK_FB_SERVICES, MOCK_USER_DATA @@ -178,7 +177,7 @@ async def test_switch_setup( entry = MockConfigEntry(domain=DOMAIN, data=MOCK_USER_DATA) entry.add_to_hass(hass) - assert await async_setup_component(hass, DOMAIN, {}) + await hass.config_entries.async_setup(entry.entry_id) await hass.async_block_till_done() assert entry.state == ConfigEntryState.LOADED diff --git a/tests/components/fritz/test_update.py b/tests/components/fritz/test_update.py index bc677e28ebe..97c9cdec25d 100644 --- a/tests/components/fritz/test_update.py +++ b/tests/components/fritz/test_update.py @@ -6,7 +6,6 @@ from homeassistant.components.fritz.const import DOMAIN from homeassistant.components.update import DOMAIN as UPDATE_DOMAIN from homeassistant.config_entries import ConfigEntryState from homeassistant.core import HomeAssistant -from homeassistant.setup import async_setup_component from .const import ( MOCK_FB_SERVICES, @@ -39,7 +38,7 @@ async def test_update_entities_initialized( entry = MockConfigEntry(domain=DOMAIN, data=MOCK_USER_DATA) entry.add_to_hass(hass) - assert await async_setup_component(hass, DOMAIN, {}) + await hass.config_entries.async_setup(entry.entry_id) await hass.async_block_till_done() assert entry.state == ConfigEntryState.LOADED @@ -60,7 +59,7 @@ async def test_update_available( entry = MockConfigEntry(domain=DOMAIN, data=MOCK_USER_DATA) entry.add_to_hass(hass) - assert await async_setup_component(hass, DOMAIN, {}) + await hass.config_entries.async_setup(entry.entry_id) await hass.async_block_till_done() assert entry.state == ConfigEntryState.LOADED @@ -83,7 +82,7 @@ async def test_no_update_available( entry = MockConfigEntry(domain=DOMAIN, data=MOCK_USER_DATA) entry.add_to_hass(hass) - assert await async_setup_component(hass, DOMAIN, {}) + await hass.config_entries.async_setup(entry.entry_id) await hass.async_block_till_done() assert entry.state == ConfigEntryState.LOADED @@ -111,7 +110,7 @@ async def test_available_update_can_be_installed( entry = MockConfigEntry(domain=DOMAIN, data=MOCK_USER_DATA) entry.add_to_hass(hass) - assert await async_setup_component(hass, DOMAIN, {}) + await hass.config_entries.async_setup(entry.entry_id) await hass.async_block_till_done() assert entry.state == ConfigEntryState.LOADED