jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-04-23 08:47:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correct trace for choose and repeat script actions (#47973)

Browse Source 
* Correct trace for choose and repeat script actions

* only choose-wrap the choices

* Update tests

Co-authored-by: Paulus Schoutsen <balloob@gmail.com>
This commit is contained in:
Erik Montnemery 2021-03-16 08:49:16 +01:00 committed by GitHub
parent 354c0a7fd1
commit 1cde1074c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
homeassistant/helpers/script.py
View File

@ -640,6 +640,7 @@ class _ScriptRun:
result = traced_test_conditions(self._hass, self._variables)
return result
@trace_path("repeat")
async def _async_repeat_step(self):
"""Repeat a sequence."""
description = self._action.get(CONF_ALIAS, "sequence")
@ -658,7 +659,7 @@ class _ScriptRun:
async def async_run_sequence(iteration, extra_msg=""):
self._log("Repeating %s: Iteration %i%s", description, iteration, extra_msg)
with trace_path(str(self._step)):
with trace_path("sequence"):
await self._async_run_script(script)
if CONF_COUNT in repeat:
@ -724,19 +725,21 @@ class _ScriptRun:
# pylint: disable=protected-access
choose_data = await self._script._async_get_choose_data(self._step)
for idx, (conditions, script) in enumerate(choose_data["choices"]):
with trace_path(str(idx)):
try:
if self._test_conditions(conditions, "choose"):
trace_set_result(choice=idx)
await self._async_run_script(script)
return
except exceptions.ConditionError as ex:
_LOGGER.warning("Error in 'choose' evaluation:\n%s", ex)
with trace_path("choose"):
for idx, (conditions, script) in enumerate(choose_data["choices"]):
with trace_path(str(idx)):
try:
if self._test_conditions(conditions, "choose"):
trace_set_result(choice=idx)
with trace_path("sequence"):
await self._async_run_script(script)
return
except exceptions.ConditionError as ex:
_LOGGER.warning("Error in 'choose' evaluation:\n%s", ex)
if choose_data["default"]:
trace_set_result(choice="default")
with trace_path("default"):
with trace_path(["default", "sequence"]):
await self._async_run_script(choose_data["default"])
async def _async_wait_for_trigger_step(self):

21
tests/helpers/test_script.py
View File

@ -1236,7 +1236,7 @@ async def test_repeat_count(hass, caplog, count):
assert_action_trace(
{
"0": [{}],
"0/0/0": [{}] * min(count, script.ACTION_TRACE_NODE_MAX_LEN),
"0/sequence/0": [{}] * min(count, script.ACTION_TRACE_NODE_MAX_LEN),
}
)
@ -1578,6 +1578,10 @@ async def test_choose(hass, caplog, var, result):
},
}
)
# Prepare tracing
trace.trace_get()
script_obj = script.Script(hass, sequence, "Test Name", "test_domain")
await script_obj.async_run(MappingProxyType({"var": var}), Context())
@ -1590,6 +1594,21 @@ async def test_choose(hass, caplog, var, result):
expected_choice = "default"
assert f"{alias}: {expected_choice}: Executing step {aliases[var]}" in caplog.text
expected_trace = {"0": [{}]}
if var >= 1:
expected_trace["0/choose/0"] = [{}]
expected_trace["0/choose/0/conditions/0"] = [{}]
if var >= 2:
expected_trace["0/choose/1"] = [{}]
expected_trace["0/choose/1/conditions/0"] = [{}]
if var == 1:
expected_trace["0/choose/0/sequence/0"] = [{}]
if var == 2:
expected_trace["0/choose/1/sequence/0"] = [{}]
if var == 3:
expected_trace["0/default/sequence/0"] = [{}]
assert_action_trace(expected_trace)
@pytest.mark.parametrize(
"action",