evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use run_job for service helper (#43696)

Browse source
This commit is contained in:
Paulus Schoutsen 2020-11-27 16:12:39 +01:00 • committed by GitHub
parent bdb04dcb9d
commit d34753473d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
homeassistant/helpers/service.py
View file

@ -531,7 +531,7 @@ async def _handle_entity_call(
else:
result = hass.async_run_job(func, entity, data)
# Guard because callback functions do not return a task when passed to async_add_job.
# Guard because callback functions do not return a task when passed to async_run_job.
if result is not None:
await result
@ -564,7 +564,7 @@ def async_register_admin_service(
if not user.is_admin:
raise Unauthorized(context=call.context)
result = hass.async_add_job(service_func, call)
result = hass.async_run_job(service_func, call)
if result is not None:
await result

18
tests/components/input_boolean/test_init.py
View file

@ -63,23 +63,21 @@ async def test_methods(hass):
assert not is_on(hass, entity_id)
await hass.services.async_call(DOMAIN, SERVICE_TURN_ON, {ATTR_ENTITY_ID: entity_id})
await hass.async_block_till_done()
await hass.services.async_call(
DOMAIN, SERVICE_TURN_ON, {ATTR_ENTITY_ID: entity_id}, blocking=True
)
assert is_on(hass, entity_id)
await hass.services.async_call(
DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: entity_id}
DOMAIN, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: entity_id}, blocking=True
)
await hass.async_block_till_done()
assert not is_on(hass, entity_id)
await hass.services.async_call(DOMAIN, SERVICE_TOGGLE, {ATTR_ENTITY_ID: entity_id})
await hass.async_block_till_done()
await hass.services.async_call(
DOMAIN, SERVICE_TOGGLE, {ATTR_ENTITY_ID: entity_id}, blocking=True
)
assert is_on(hass, entity_id)
@ -246,7 +244,6 @@ async def test_reload(hass, hass_admin_user):
blocking=True,
context=Context(user_id=hass_admin_user.id),
)
await hass.async_block_till_done()
assert count_start + 2 == len(hass.states.async_entity_ids())
@ -349,6 +346,5 @@ async def test_setup_no_config(hass, hass_admin_user):
blocking=True,
context=Context(user_id=hass_admin_user.id),
)
await hass.async_block_till_done()
assert count_start == len(hass.states.async_entity_ids())

3
tests/components/input_datetime/test_init.py
View file

@ -276,7 +276,6 @@ async def test_set_invalid_2(hass):
{"entity_id": entity_id, "time": time_portion, "datetime": dt_obj},
blocking=True,
)
await hass.async_block_till_done()
state = hass.states.get(entity_id)
assert state.state == initial
@ -467,7 +466,6 @@ async def test_reload(hass, hass_admin_user, hass_read_only_user):
blocking=True,
context=Context(user_id=hass_admin_user.id),
)
await hass.async_block_till_done()
assert count_start + 2 == len(hass.states.async_entity_ids())
@ -643,7 +641,6 @@ async def test_setup_no_config(hass, hass_admin_user):
blocking=True,
context=Context(user_id=hass_admin_user.id),
)
await hass.async_block_till_done()
assert count_start == len(hass.states.async_entity_ids())