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

Make script services always respond when asked (#95991)

Browse source 
* Make script services always respond when asked

* Update test_init.py
This commit is contained in:
Bram Kragten 2023-07-06 16:48:03 +02:00 • committed by GitHub
parent 2b0f2227fd
commit 5d9533fb90
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
homeassistant/components/script/__init__.py
View file

@ -608,7 +608,7 @@ class ScriptEntity(BaseScriptEntity, RestoreEntity):
variables=service.data, context=service.context, wait=True variables=service.data, context=service.context, wait=True
) )
if service.return_response: if service.return_response:
return response return response or {}
return None return None
async def async_added_to_hass(self) -> None: async def async_added_to_hass(self) -> None:

11
tests/components/script/test_init.py
View file

@ -26,7 +26,7 @@ from homeassistant.core import (
callback, callback,
split_entity_id, split_entity_id,
) )
from homeassistant.exceptions import HomeAssistantError, ServiceNotFound from homeassistant.exceptions import ServiceNotFound
from homeassistant.helpers import entity_registry as er, template from homeassistant.helpers import entity_registry as er, template
from homeassistant.helpers.event import async_track_state_change from homeassistant.helpers.event import async_track_state_change
from homeassistant.helpers.script import ( from homeassistant.helpers.script import (
@ -1625,7 +1625,7 @@ async def test_responses(hass: HomeAssistant, response: Any) -> None:
) )
async def test_responses_error(hass: HomeAssistant) -> None: async def test_responses_no_response(hass: HomeAssistant) -> None:
"""Test response variable not set.""" """Test response variable not set."""
mock_restore_cache(hass, ()) mock_restore_cache(hass, ())
assert await async_setup_component( assert await async_setup_component(
@ -1645,10 +1645,13 @@ async def test_responses_error(hass: HomeAssistant) -> None:
}, },
) )
with pytest.raises(HomeAssistantError): # Validate we can call it with return_response
assert await hass.services.async_call( assert (
await hass.services.async_call(
DOMAIN, "test", {"greeting": "world"}, blocking=True, return_response=True DOMAIN, "test", {"greeting": "world"}, blocking=True, return_response=True
) )
== {}
)
# Validate we can also call it without return_response # Validate we can also call it without return_response
assert ( assert (
await hass.services.async_call( await hass.services.async_call(