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

Fix changed_variables in automation and script traces (#108788)

Browse source
This commit is contained in:
Erik Montnemery 2024-01-24 19:12:45 +01:00 • committed by GitHub
parent aa86d87a31
commit 909e58066d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
homeassistant/helpers/script.py
View file

@ -477,11 +477,12 @@ class _ScriptRun:
try:
handler = f"_async_{action}_step"
await getattr(self, handler)()
trace_element.update_variables(self._variables)
except Exception as ex: # pylint: disable=broad-except
self._handle_exception(
ex, continue_on_error, self._log_exceptions or log_exceptions
)
finally:
trace_element.update_variables(self._variables)
def _finish(self) -> None:
self._script._runs.remove(self) # pylint: disable=protected-access

3
tests/helpers/test_script.py
View file

@ -1337,14 +1337,13 @@ async def test_wait_continue_on_timeout(
result_wait = {"wait": {"trigger": None, "remaining": 0.0}}
variable_wait = dict(result_wait)
expected_trace = {
"0": [{"result": result_wait}],
"0": [{"result": result_wait, "variables": variable_wait}],
}
if continue_on_timeout is False:
expected_trace["0"][0]["result"]["timeout"] = True
expected_trace["0"][0]["error"] = ""
expected_script_execution = "aborted"
else:
expected_trace["0"][0]["variables"] = variable_wait
expected_trace["1"] = [{"result": {"event": "test_event", "event_data": {}}}]
expected_script_execution = "finished"
assert_action_trace(expected_trace, expected_script_execution)