jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-25 06:07:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move runtime_data deletion after unload (#119224)

Browse Source 
* Move runtime_data deletion after unload.

Doing this before unload means we can't use, eg. the coordinator, during teardown.

* Re-order config entry on unload

* Add test

---------

Co-authored-by: Paulus Schoutsen <balloob@gmail.com>
This commit is contained in:
Jake Martin 2024-06-11 03:11:07 +01:00 committed by GitHub
parent 3308f07d4b
commit 9bb9792607
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
homeassistant/config_entries.py
View File

@ -803,13 +803,13 @@ class ConfigEntry(Generic[_DataT]):
assert isinstance(result, bool) assert isinstance(result, bool)
# Only adjust state if we unloaded the component # Only adjust state if we unloaded the component
if domain_is_integration: if domain_is_integration and result:
if result:
self._async_set_state(hass, ConfigEntryState.NOT_LOADED, None)
if hasattr(self, "runtime_data"):
object.__delattr__(self, "runtime_data")
await self._async_process_on_unload(hass) await self._async_process_on_unload(hass)
if hasattr(self, "runtime_data"):
object.__delattr__(self, "runtime_data")
self._async_set_state(hass, ConfigEntryState.NOT_LOADED, None)
except Exception as exc: except Exception as exc:
_LOGGER.exception( _LOGGER.exception(
"Error unloading entry %s for %s", self.title, integration.domain "Error unloading entry %s for %s", self.title, integration.domain

15
tests/test_config_entries.py
View File

@ -1726,16 +1726,23 @@ async def test_entry_unload_succeed(
hass: HomeAssistant, manager: config_entries.ConfigEntries hass: HomeAssistant, manager: config_entries.ConfigEntries
) -> None: ) -> None:
"""Test that we can unload an entry.""" """Test that we can unload an entry."""
unloads_called = []
async def verify_runtime_data(*args):
"""Verify runtime data."""
assert entry.runtime_data == 2
unloads_called.append(args)
return True
entry = MockConfigEntry(domain="comp", state=config_entries.ConfigEntryState.LOADED) entry = MockConfigEntry(domain="comp", state=config_entries.ConfigEntryState.LOADED)
entry.add_to_hass(hass) entry.add_to_hass(hass)
entry.async_on_unload(verify_runtime_data)
entry.runtime_data = 2 entry.runtime_data = 2
async_unload_entry = AsyncMock(return_value=True) mock_integration(hass, MockModule("comp", async_unload_entry=verify_runtime_data))
mock_integration(hass, MockModule("comp", async_unload_entry=async_unload_entry))
assert await manager.async_unload(entry.entry_id) assert await manager.async_unload(entry.entry_id)
assert len(async_unload_entry.mock_calls) == 1 assert len(unloads_called) == 2
assert entry.state is config_entries.ConfigEntryState.NOT_LOADED assert entry.state is config_entries.ConfigEntryState.NOT_LOADED
assert not hasattr(entry, "runtime_data") assert not hasattr(entry, "runtime_data")