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

Remove hass.helpers from config_entries (#70660)

Browse Source
This commit is contained in:
Martin Hjelmare 2022-04-25 14:21:03 +02:00 committed by GitHub
parent 0cdfd386a7
commit 09b4b7eb37
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
homeassistant/config_entries.py
View File

@ -19,7 +19,7 @@ from .components import persistent_notification
from .const import EVENT_HOMEASSISTANT_STARTED, EVENT_HOMEASSISTANT_STOP, Platform from .const import EVENT_HOMEASSISTANT_STARTED, EVENT_HOMEASSISTANT_STOP, Platform
from .core import CALLBACK_TYPE, CoreState, Event, HomeAssistant, callback from .core import CALLBACK_TYPE, CoreState, Event, HomeAssistant, callback
from .exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady, HomeAssistantError from .exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady, HomeAssistantError
from .helpers import device_registry, entity_registry from .helpers import device_registry, entity_registry, storage
from .helpers.event import async_call_later from .helpers.event import async_call_later
from .helpers.frame import report from .helpers.frame import report
from .helpers.typing import UNDEFINED, ConfigType, DiscoveryInfoType, UndefinedType from .helpers.typing import UNDEFINED, ConfigType, DiscoveryInfoType, UndefinedType
@ -803,7 +803,7 @@ class ConfigEntries:
self._hass_config = hass_config self._hass_config = hass_config
self._entries: dict[str, ConfigEntry] = {} self._entries: dict[str, ConfigEntry] = {}
self._domain_index: dict[str, list[str]] = {} self._domain_index: dict[str, list[str]] = {}
self._store = hass.helpers.storage.Store(STORAGE_VERSION, STORAGE_KEY) self._store = storage.Store(hass, STORAGE_VERSION, STORAGE_KEY)
EntityRegistryDisabledHandler(hass).async_setup() EntityRegistryDisabledHandler(hass).async_setup()
@callback @callback
@ -863,10 +863,8 @@ class ConfigEntries:
del self._domain_index[entry.domain] del self._domain_index[entry.domain]
self._async_schedule_save() self._async_schedule_save()
dev_reg, ent_reg = await asyncio.gather( dev_reg = device_registry.async_get(self.hass)
self.hass.helpers.device_registry.async_get_registry(), ent_reg = entity_registry.async_get(self.hass)
self.hass.helpers.entity_registry.async_get_registry(),
)
dev_reg.async_clear_config_entry(entry_id) dev_reg.async_clear_config_entry(entry_id)
ent_reg.async_clear_config_entry(entry_id) ent_reg.async_clear_config_entry(entry_id)
@ -911,7 +909,8 @@ class ConfigEntries:
async def async_initialize(self) -> None: async def async_initialize(self) -> None:
"""Initialize config entry config.""" """Initialize config entry config."""
# Migrating for config entries stored before 0.73 # Migrating for config entries stored before 0.73
config = await self.hass.helpers.storage.async_migrator( config = await storage.async_migrator(
self.hass,
self.hass.config.path(PATH_CONFIG), self.hass.config.path(PATH_CONFIG),
self._store, self._store,
old_conf_migrate_func=_old_conf_migrator, old_conf_migrate_func=_old_conf_migrator,

2
tests/common.py
View File

@ -292,8 +292,6 @@ async def async_test_home_assistant(loop, load_registries=True):
"_": "Not empty or else some bad checks for hass config in discovery.py breaks" "_": "Not empty or else some bad checks for hass config in discovery.py breaks"
}, },
) )
hass.config_entries._entries = {}
hass.config_entries._store._async_ensure_stop_listener = lambda: None
# Load the registries # Load the registries
if load_registries: if load_registries:

4
tests/test_config_entries.py
View File

@ -61,8 +61,6 @@ def mock_handlers():
def manager(hass): def manager(hass):
"""Fixture of a loaded config manager.""" """Fixture of a loaded config manager."""
manager = config_entries.ConfigEntries(hass, {}) manager = config_entries.ConfigEntries(hass, {})
manager._entries = {}
manager._store._async_ensure_stop_listener = lambda: None
hass.config_entries = manager hass.config_entries = manager
return manager return manager
@ -2305,6 +2303,7 @@ async def test_async_setup_init_entry(hass):
async def test_async_setup_init_entry_completes_before_loaded_event_fires(hass): async def test_async_setup_init_entry_completes_before_loaded_event_fires(hass):
"""Test a config entry being initialized during integration setup before the loaded event fires.""" """Test a config entry being initialized during integration setup before the loaded event fires."""
load_events: list[Event] = []
@callback @callback
def _record_load(event: Event) -> None: def _record_load(event: Event) -> None:
@ -2312,7 +2311,6 @@ async def test_async_setup_init_entry_completes_before_loaded_event_fires(hass):
load_events.append(event) load_events.append(event)
listener = hass.bus.async_listen(EVENT_COMPONENT_LOADED, _record_load) listener = hass.bus.async_listen(EVENT_COMPONENT_LOADED, _record_load)
load_events: list[Event] = []
async def mock_async_setup(hass, config): async def mock_async_setup(hass, config):
"""Mock setup.""" """Mock setup."""