Skip to content

Commit

Permalink
Fix race condition in group.set (#18796)
Browse files Browse the repository at this point in the history
  • Loading branch information
balloob committed Nov 29, 2018
1 parent fa9a200 commit 7fa5f07
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 1 deletion.
9 changes: 8 additions & 1 deletion homeassistant/components/group/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,13 @@ async def reload_service_handler(service):
DOMAIN, SERVICE_RELOAD, reload_service_handler,
schema=RELOAD_SERVICE_SCHEMA)

service_lock = asyncio.Lock()

async def locked_service_handler(service):
"""Handle a service with an async lock."""
async with service_lock:
await groups_service_handler(service)

async def groups_service_handler(service):
"""Handle dynamic group service functions."""
object_id = service.data[ATTR_OBJECT_ID]
Expand Down Expand Up @@ -284,7 +291,7 @@ async def groups_service_handler(service):
await component.async_remove_entity(entity_id)

hass.services.async_register(
DOMAIN, SERVICE_SET, groups_service_handler,
DOMAIN, SERVICE_SET, locked_service_handler,
schema=SET_SERVICE_SCHEMA)

hass.services.async_register(
Expand Down
21 changes: 21 additions & 0 deletions tests/helpers/test_entity_component.py
Original file line number Diff line number Diff line change
Expand Up @@ -431,3 +431,24 @@ async def test_update_entity(hass):

assert len(entity.async_update_ha_state.mock_calls) == 2
assert entity.async_update_ha_state.mock_calls[-1][1][0] is True


async def test_set_service_race(hass):
"""Test race condition on setting service."""
exception = False

def async_loop_exception_handler(_, _2) -> None:
"""Handle all exception inside the core loop."""
nonlocal exception
exception = True

hass.loop.set_exception_handler(async_loop_exception_handler)

await async_setup_component(hass, 'group', {})
component = EntityComponent(_LOGGER, DOMAIN, hass, group_name='yo')

for i in range(2):
hass.async_create_task(component.async_add_entities([MockEntity()]))

await hass.async_block_till_done()
assert not exception

0 comments on commit 7fa5f07

Please sign in to comment.