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

Ensure mobile_app notifications get re-registered after adding,removing,adding (#39362)

Browse Source
This commit is contained in:
J. Nick Koston 2020-08-28 14:08:09 -05:00 committed by GitHub
parent a99efcb5c2
commit 92c06f0818
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
homeassistant/components/notify/__init__.py
View File

@ -66,7 +66,12 @@ async def async_reload(hass, integration_name):
): ):
return return
data = hass.data[NOTIFY_SERVICES][integration_name] for data in hass.data[NOTIFY_SERVICES][integration_name]:
await _async_setup_notify_services(hass, data)
async def _async_setup_notify_services(hass, data):
"""Create or remove the notify services."""
notify_service = data[SERVICE] notify_service = data[SERVICE]
friendly_name = data[FRIENDLY_NAME] friendly_name = data[FRIENDLY_NAME]
targets = data[TARGETS] targets = data[TARGETS]
@ -94,6 +99,7 @@ async def async_reload(hass, integration_name):
) )
for stale_target_name in stale_targets: for stale_target_name in stale_targets:
del targets[stale_target_name]
hass.services.async_remove( hass.services.async_remove(
DOMAIN, DOMAIN,
stale_target_name, stale_target_name,
@ -187,12 +193,11 @@ async def async_setup(hass, config):
target_friendly_name = ( target_friendly_name = (
p_config.get(CONF_NAME) or discovery_info.get(CONF_NAME) or integration_name p_config.get(CONF_NAME) or discovery_info.get(CONF_NAME) or integration_name
) )
friendly_name = ( friendly_name = (
p_config.get(CONF_NAME) or discovery_info.get(CONF_NAME) or SERVICE_NOTIFY p_config.get(CONF_NAME) or discovery_info.get(CONF_NAME) or SERVICE_NOTIFY
) )
hass.data[NOTIFY_SERVICES][integration_name] = { data = {
FRIENDLY_NAME: friendly_name, FRIENDLY_NAME: friendly_name,
# The targets use a slightly different friendly name # The targets use a slightly different friendly name
# selection pattern than the base service # selection pattern than the base service
@ -200,8 +205,10 @@ async def async_setup(hass, config):
SERVICE: notify_service, SERVICE: notify_service,
TARGETS: {}, TARGETS: {},
} }
hass.data[NOTIFY_SERVICES].setdefault(integration_name, [])
hass.data[NOTIFY_SERVICES][integration_name].append(data)
await async_reload(hass, integration_name) await _async_setup_notify_services(hass, data)
hass.config.components.add(f"{DOMAIN}.{integration_name}") hass.config.components.add(f"{DOMAIN}.{integration_name}")

7
tests/components/mobile_app/test_notify.py
View File

@ -96,6 +96,13 @@ async def setup_push_receiver(hass, aioclient_mock):
assert hass.services.has_service("notify", "mobile_app_test") assert hass.services.has_service("notify", "mobile_app_test")
assert not hass.services.has_service("notify", "mobile_app_loaded_late") assert not hass.services.has_service("notify", "mobile_app_loaded_late")
loaded_late_entry.add_to_hass(hass)
assert await hass.config_entries.async_setup(loaded_late_entry.entry_id)
await hass.async_block_till_done()
assert hass.services.has_service("notify", "mobile_app_test")
assert hass.services.has_service("notify", "mobile_app_loaded_late")
async def test_notify_works(hass, aioclient_mock, setup_push_receiver): async def test_notify_works(hass, aioclient_mock, setup_push_receiver):
"""Test notify works.""" """Test notify works."""