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

Fix changed_variables in automation traces (#106665)

Browse source
This commit is contained in:
Erik Montnemery 2023-12-30 08:34:21 +01:00 • committed by GitHub
parent 9e3869ae1c
commit 461dad3039
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 50 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

49
tests/helpers/test_script.py
View file

@ -386,7 +386,10 @@ async def test_calling_service_response_data(
"target": {},
},
"running_script": False,
}
},
"variables": {
"my_response": {"data": "value-12345"},
},
}
],
"1": [
@ -399,10 +402,7 @@ async def test_calling_service_response_data(
"target": {},
},
"running_script": False,
},
"variables": {
"my_response": {"data": "value-12345"},
},
}
}
],
}
@ -1163,13 +1163,13 @@ async def test_wait_template_not_schedule(hass: HomeAssistant) -> None:
assert_action_trace(
{
"0": [{"result": {"event": "test_event", "event_data": {}}}],
"1": [{"result": {"wait": {"completed": True, "remaining": None}}}],
"2": [
"1": [
{
"result": {"event": "test_event", "event_data": {}},
"result": {"wait": {"completed": True, "remaining": None}},
"variables": {"wait": {"completed": True, "remaining": None}},
}
],
"2": [{"result": {"event": "test_event", "event_data": {}}}],
}
)
@ -1230,13 +1230,13 @@ async def test_wait_timeout(
else:
variable_wait = {"wait": {"trigger": None, "remaining": 0.0}}
expected_trace = {
"0": [{"result": variable_wait}],
"1": [
"0": [
{
"result": {"event": "test_event", "event_data": {}},
"result": variable_wait,
"variables": variable_wait,
}
],
"1": [{"result": {"event": "test_event", "event_data": {}}}],
}
assert_action_trace(expected_trace)
@ -1291,19 +1291,14 @@ async def test_wait_continue_on_timeout(
else:
variable_wait = {"wait": {"trigger": None, "remaining": 0.0}}
expected_trace = {
"0": [{"result": variable_wait}],
"0": [{"result": variable_wait, "variables": variable_wait}],
}
if continue_on_timeout is False:
expected_trace["0"][0]["result"]["timeout"] = True
expected_trace["0"][0]["error_type"] = asyncio.TimeoutError
expected_script_execution = "aborted"
else:
expected_trace["1"] = [
{
"result": {"event": "test_event", "event_data": {}},
"variables": variable_wait,
}
]
expected_trace["1"] = [{"result": {"event": "test_event", "event_data": {}}}]
expected_script_execution = "finished"
assert_action_trace(expected_trace, expected_script_execution)
@ -3269,12 +3264,12 @@ async def test_parallel(hass: HomeAssistant, caplog: pytest.LogCaptureFixture) -
"description": "state of switch.trigger",
},
}
}
},
"variables": {"wait": {"remaining": None}},
}
],
"0/parallel/1/sequence/0": [
{
"variables": {},
"result": {
"event": "test_event",
"event_data": {"hello": "from action 2", "what": "world"},
@ -3283,7 +3278,6 @@ async def test_parallel(hass: HomeAssistant, caplog: pytest.LogCaptureFixture) -
],
"0/parallel/0/sequence/1": [
{
"variables": {"wait": {"remaining": None}},
"result": {
"event": "test_event",
"event_data": {"hello": "from action 1", "what": "world"},
@ -4462,7 +4456,7 @@ async def test_set_variable(
assert f"Executing step {alias}" in caplog.text
expected_trace = {
"0": [{}],
"0": [{"variables": {"variable": "value"}}],
"1": [
{
"result": {
@ -4474,7 +4468,6 @@ async def test_set_variable(
},
"running_script": False,
},
"variables": {"variable": "value"},
}
],
}
@ -4504,7 +4497,7 @@ async def test_set_redefines_variable(
assert mock_calls[1].data["value"] == 2
expected_trace = {
"0": [{}],
"0": [{"variables": {"variable": "1"}}],
"1": [
{
"result": {
@ -4515,11 +4508,10 @@ async def test_set_redefines_variable(
"target": {},
},
"running_script": False,
},
"variables": {"variable": "1"},
}
}
],
"2": [{}],
"2": [{"variables": {"variable": 2}}],
"3": [
{
"result": {
@ -4530,8 +4522,7 @@ async def test_set_redefines_variable(
"target": {},
},
"running_script": False,
},
"variables": {"variable": 2},
}
}
],
}