Move Home Connect entry state assertion at tests (#144027)

Author: Diegorro98

tests/components/home_connect/conftest.py

@@ -36,6 +36,7 @@
     async_import_client_credential,
 )
 from homeassistant.components.home_connect.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
@@ -147,6 +148,7 @@ async def mock_integration_setup(
     config_entry.add_to_hass(hass)
 
     async def run(client: MagicMock) -> bool:
+        assert config_entry.state is ConfigEntryState.NOT_LOADED
         with (
             patch("homeassistant.components.home_connect.PLATFORMS", platforms),
             patch(

tests/components/home_connect/test_binary_sensor.py

@@ -51,7 +51,6 @@ async def test_paired_depaired_devices_flow(
     appliance: HomeAppliance,
 ) -> None:
     """Test that removed devices are correctly removed from and added to hass on API events."""
-    assert config_entry.state == ConfigEntryState.NOT_LOADED
     assert await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
 
@@ -128,7 +127,6 @@ def get_status_side_effect(ha_id: str):
         return get_status_original_mock.return_value
 
     client.get_status = AsyncMock(side_effect=get_status_side_effect)
-    assert config_entry.state == ConfigEntryState.NOT_LOADED
     assert await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
     client.get_status = get_status_original_mock
@@ -179,7 +177,6 @@ async def test_binary_sensors_entity_availability(
     entity_ids = [
         "binary_sensor.washer_remote_control",
     ]
-    assert config_entry.state == ConfigEntryState.NOT_LOADED
     assert await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
 
@@ -279,7 +276,6 @@ async def test_binary_sensors_functionality(
     expected: str,
 ) -> None:
     """Tests for Home Connect Fridge appliance door states."""
-    assert config_entry.state == ConfigEntryState.NOT_LOADED
     assert await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
     await client.add_events(
@@ -316,7 +312,6 @@ async def test_connected_sensor_functionality(
 ) -> None:
     """Test if the connected binary sensor reports the right values."""
     entity_id = "binary_sensor.washer_connectivity"
-    assert config_entry.state == ConfigEntryState.NOT_LOADED
     assert await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
 

tests/components/home_connect/test_button.py

@@ -43,7 +43,6 @@ async def test_paired_depaired_devices_flow(
     appliance: HomeAppliance,
 ) -> None:
     """Test that removed devices are correctly removed from and added to hass on API events."""
-    assert config_entry.state == ConfigEntryState.NOT_LOADED
     assert await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
 
@@ -131,7 +130,6 @@ async def get_all_programs_side_effect(ha_id: str):
         side_effect=get_available_commands_side_effect
     )
     client.get_all_programs = AsyncMock(side_effect=get_all_programs_side_effect)
-    assert config_entry.state == ConfigEntryState.NOT_LOADED
     assert await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
     client.get_available_commands = get_available_commands_original_mock
@@ -183,7 +181,6 @@ async def test_button_entity_availability(
         "button.washer_pause_program",
         "button.washer_stop_program",
     ]
-    assert config_entry.state == ConfigEntryState.NOT_LOADED
     assert await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
 
@@ -246,7 +243,6 @@ async def test_button_functionality(
     appliance: HomeAppliance,
 ) -> None:
     """Test if button entities availability are based on the appliance connection state."""
-    assert config_entry.state == ConfigEntryState.NOT_LOADED
     assert await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
 
@@ -282,7 +278,6 @@ async def test_command_button_exception(
             ]
         )
     )
-    assert config_entry.state == ConfigEntryState.NOT_LOADED
     assert await integration_setup(client_with_exception)
     assert config_entry.state == ConfigEntryState.LOADED
 
@@ -308,7 +303,6 @@ async def test_stop_program_button_exception(
     """Test if button entities availability are based on the appliance connection state."""
     entity_id = "button.washer_stop_program"
 
-    assert config_entry.state == ConfigEntryState.NOT_LOADED
     assert await integration_setup(client_with_exception)
     assert config_entry.state == ConfigEntryState.LOADED
 

tests/components/home_connect/test_coordinator.py

@@ -218,7 +218,6 @@ async def test_coordinator_not_fetching_on_disconnected_appliance(
     """Test that the coordinator does not fetch anything on disconnected appliance."""
     appliance.connected = False
 
-    assert config_entry.state == ConfigEntryState.NOT_LOADED
     await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
 
@@ -242,7 +241,6 @@ async def test_coordinator_update_failing(
     """
     setattr(client, mock_method, AsyncMock(side_effect=HomeConnectError()))
 
-    assert config_entry.state == ConfigEntryState.NOT_LOADED
     await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
 
@@ -286,7 +284,6 @@ async def test_event_listener(
     entity_id: str,
 ) -> None:
     """Test that the event listener works."""
-    assert config_entry.state == ConfigEntryState.NOT_LOADED
     await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
 
@@ -353,7 +350,6 @@ async def tests_receive_setting_and_status_for_first_time_at_events(
     client.get_setting = AsyncMock(return_value=ArrayOfSettings([]))
     client.get_status = AsyncMock(return_value=ArrayOfStatus([]))
 
-    assert config_entry.state == ConfigEntryState.NOT_LOADED
     await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
 
@@ -468,7 +464,6 @@ async def stream_exception():
         side_effect=[stream_exception(), client.stream_all_events()]
     )
 
-    assert config_entry.state == ConfigEntryState.NOT_LOADED
     await integration_setup(client)
     await hass.async_block_till_done()
 
@@ -531,7 +526,6 @@ async def test_devices_updated_on_refresh(
     )
 
     await async_setup_component(hass, HA_DOMAIN, {})
-    assert config_entry.state == ConfigEntryState.NOT_LOADED
     await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
 
@@ -564,7 +558,6 @@ async def test_paired_disconnected_devices_not_fetching(
 ) -> None:
     """Test that Home Connect API is not fetched after pairing a disconnected device."""
     client.get_home_appliances = AsyncMock(return_value=ArrayOfHomeAppliances([]))
-    assert config_entry.state == ConfigEntryState.NOT_LOADED
     assert await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
 
@@ -601,7 +594,6 @@ async def test_coordinator_disabling_updates_for_appliance(
     appliance_ha_id = "SIEMENS-HCS02DWH1-6BE58C26DCC1"
     issue_id = f"home_connect_too_many_connected_paired_events_{appliance_ha_id}"
 
-    assert config_entry.state == ConfigEntryState.NOT_LOADED
     assert await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
 
@@ -692,7 +684,6 @@ async def test_coordinator_disabling_updates_for_appliance_is_gone_after_entry_r
     appliance_ha_id = "SIEMENS-HCS02DWH1-6BE58C26DCC1"
     issue_id = f"home_connect_too_many_connected_paired_events_{appliance_ha_id}"
 
-    assert config_entry.state == ConfigEntryState.NOT_LOADED
     assert await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
 
@@ -718,7 +709,6 @@ async def test_coordinator_disabling_updates_for_appliance_is_gone_after_entry_r
 
     assert not issue_registry.async_get_issue(DOMAIN, issue_id)
 
-    assert config_entry.state == ConfigEntryState.NOT_LOADED
     assert await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
 

tests/components/home_connect/test_diagnostics.py

@@ -25,7 +25,6 @@ async def test_async_get_config_entry_diagnostics(
     snapshot: SnapshotAssertion,
 ) -> None:
     """Test config entry diagnostics."""
-    assert config_entry.state == ConfigEntryState.NOT_LOADED
     assert await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
 
@@ -41,7 +40,6 @@ async def test_async_get_device_diagnostics(
     snapshot: SnapshotAssertion,
 ) -> None:
     """Test device config entry diagnostics."""
-    assert config_entry.state == ConfigEntryState.NOT_LOADED
     assert await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
 

tests/components/home_connect/test_entity.py

@@ -157,7 +157,6 @@ async def get_all_programs_with_options_mock(ha_id: str) -> ArrayOfPrograms:
         )
     )
 
-    assert config_entry.state == ConfigEntryState.NOT_LOADED
     assert await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
 
@@ -276,7 +275,6 @@ async def get_all_programs_with_options_mock(ha_id: str) -> ArrayOfPrograms:
 
     client.get_all_programs = AsyncMock(side_effect=get_all_programs_with_options_mock)
 
-    assert config_entry.state == ConfigEntryState.NOT_LOADED
     assert await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
 
@@ -357,7 +355,6 @@ async def get_home_appliances_with_options_mock() -> ArrayOfHomeAppliances:
         )
     )
 
-    assert config_entry.state == ConfigEntryState.NOT_LOADED
     assert await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
 
@@ -469,7 +466,6 @@ async def test_option_entity_functionality_exception(
         )
     )
 
-    assert config_entry.state == ConfigEntryState.NOT_LOADED
     assert await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
 

tests/components/home_connect/test_init.py

@@ -46,7 +46,6 @@ async def test_entry_setup(
     integration_setup: Callable[[MagicMock], Awaitable[bool]],
 ) -> None:
     """Test setup and unload."""
-    assert config_entry.state == ConfigEntryState.NOT_LOADED
     assert await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
 
@@ -182,7 +181,6 @@ async def test_client_error(
     """Test client errors during setup integration."""
     client_with_exception.get_home_appliances.return_value = None
     client_with_exception.get_home_appliances.side_effect = exception
-    assert config_entry.state == ConfigEntryState.NOT_LOADED
     assert not await integration_setup(client_with_exception)
     assert config_entry.state == expected_state
     assert client_with_exception.get_home_appliances.call_count == 1
@@ -239,7 +237,6 @@ async def test_required_program_or_at_least_an_option(
 ) -> None:
     "Test that the set_program_and_options does raise an exception if no program nor options are set."
 
-    assert config_entry.state == ConfigEntryState.NOT_LOADED
     assert await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
 

tests/components/home_connect/test_light.py

@@ -64,7 +64,6 @@ async def test_paired_depaired_devices_flow(
     appliance: HomeAppliance,
 ) -> None:
     """Test that removed devices are correctly removed from and added to hass on API events."""
-    assert config_entry.state == ConfigEntryState.NOT_LOADED
     assert await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
 
@@ -141,7 +140,6 @@ async def get_settings_side_effect(ha_id: str):
         return await get_settings_original_mock.side_effect(ha_id)
 
     client.get_settings = AsyncMock(side_effect=get_settings_side_effect)
-    assert config_entry.state == ConfigEntryState.NOT_LOADED
     assert await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
     client.get_settings = get_settings_original_mock
@@ -186,7 +184,6 @@ async def test_light_availability(
     entity_ids = [
         "light.hood_functional_light",
     ]
-    assert config_entry.state == ConfigEntryState.NOT_LOADED
     assert await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
 
@@ -353,7 +350,6 @@ async def test_light_functionality(
     appliance: HomeAppliance,
 ) -> None:
     """Test light functionality."""
-    assert config_entry.state == ConfigEntryState.NOT_LOADED
     assert await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
 
@@ -405,7 +401,6 @@ async def test_light_color_different_than_custom(
     appliance: HomeAppliance,
 ) -> None:
     """Test that light color attributes are not set if color is different than custom."""
-    assert config_entry.state == ConfigEntryState.NOT_LOADED
     assert await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
     await hass.services.async_call(
@@ -586,7 +581,6 @@ async def test_light_exception_handling(
     client_with_exception.set_setting.side_effect = [
         exception() if exception else None for exception in attr_side_effect
     ]
-    assert config_entry.state == ConfigEntryState.NOT_LOADED
     assert await integration_setup(client_with_exception)
     assert config_entry.state == ConfigEntryState.LOADED
 

tests/components/home_connect/test_number.py

@@ -80,7 +80,6 @@ async def test_paired_depaired_devices_flow(
             ],
         )
     )
-    assert config_entry.state == ConfigEntryState.NOT_LOADED
     assert await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
 
@@ -159,7 +158,6 @@ def get_settings_side_effect(ha_id: str):
         return get_settings_original_mock.return_value
 
     client.get_settings = AsyncMock(side_effect=get_settings_side_effect)
-    assert config_entry.state == ConfigEntryState.NOT_LOADED
     assert await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
     client.get_settings = get_settings_original_mock
@@ -209,7 +207,6 @@ async def test_number_entity_availability(
     # Setting constrains are not needed for this test
     # so we rise an error to easily test the availability
     client.get_setting = AsyncMock(side_effect=HomeConnectError())
-    assert config_entry.state == ConfigEntryState.NOT_LOADED
     assert await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
 
@@ -316,7 +313,6 @@ async def test_number_entity_functionality(
         )
     )
 
-    assert config_entry.state is ConfigEntryState.NOT_LOADED
     assert await integration_setup(client)
     assert config_entry.state is ConfigEntryState.LOADED
     entity_state = hass.states.get(entity_id)
@@ -420,7 +416,6 @@ def get_settings_side_effect(ha_id: str):
         ]
     )
 
-    assert config_entry.state is ConfigEntryState.NOT_LOADED
     assert await integration_setup(client)
     async_fire_time_changed(hass)
     await hass.async_block_till_done()
@@ -472,7 +467,6 @@ async def test_number_entity_error(
             )
         ]
     )
-    assert config_entry.state is ConfigEntryState.NOT_LOADED
     assert await integration_setup(client_with_exception)
     assert config_entry.state is ConfigEntryState.LOADED
 
@@ -599,7 +593,6 @@ async def set_program_option_side_effect(ha_id: str, *_, **kwargs) -> None:
         )
     )
 
-    assert config_entry.state == ConfigEntryState.NOT_LOADED
     assert await integration_setup(client)
     assert config_entry.state == ConfigEntryState.LOADED
     entity_state = hass.states.get(entity_id)