From 5d9533fb9009e8c6c0de5435c64d2e50dbcb0e30 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Thu, 6 Jul 2023 16:48:03 +0200
Subject: [PATCH] Make script services always respond when asked (#95991)

* Make script services always respond when asked

* Update test_init.py
---
 homeassistant/components/script/__init__.py |  2 +-
 tests/components/script/test_init.py        | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/homeassistant/components/script/__init__.py b/homeassistant/components/script/__init__.py
index f8d41db0e11..8530aa3b04c 100644
--- a/homeassistant/components/script/__init__.py
+++ b/homeassistant/components/script/__init__.py
@@ -608,7 +608,7 @@ class ScriptEntity(BaseScriptEntity, RestoreEntity):
             variables=service.data, context=service.context, wait=True
         )
         if service.return_response:
-            return response
+            return response or {}
         return None
 
     async def async_added_to_hass(self) -> None:
diff --git a/tests/components/script/test_init.py b/tests/components/script/test_init.py
index 199c3e08942..cc41b6c404c 100644
--- a/tests/components/script/test_init.py
+++ b/tests/components/script/test_init.py
@@ -26,7 +26,7 @@ from homeassistant.core import (
     callback,
     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.event import async_track_state_change
 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."""
     mock_restore_cache(hass, ())
     assert await async_setup_component(
@@ -1645,10 +1645,13 @@ async def test_responses_error(hass: HomeAssistant) -> None:
         },
     )
 
-    with pytest.raises(HomeAssistantError):
-        assert await hass.services.async_call(
+    # Validate we can call it with return_response
+    assert (
+        await hass.services.async_call(
             DOMAIN, "test", {"greeting": "world"}, blocking=True, return_response=True
         )
+        == {}
+    )
     # Validate we can also call it without return_response
     assert (
         await hass.services.async_call(