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

Improve trace of template conditions (#49101)

Browse source 
* Improve trace of template conditions

* Refactor

* Fix wait_template trace

* Update tests
This commit is contained in:
Erik Montnemery 2021-04-12 20:22:28 +02:00 • committed by GitHub
parent 106dc4d28a
commit ff5fbea1fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 60 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

22
tests/helpers/test_script.py
View file

@ -1449,7 +1449,7 @@ async def test_condition_basic(hass, caplog):
{
"0": [{"result": {"event": "test_event", "event_data": {}}}],
"1": [{"result": {"result": True}}],
"1/condition": [{"result": {"result": True}}],
"1/condition": [{"result": {"entities": ["test.entity"], "result": True}}],
"2": [{"result": {"event": "test_event", "event_data": {}}}],
}
)
@ -1466,7 +1466,7 @@ async def test_condition_basic(hass, caplog):
{
"0": [{"result": {"event": "test_event", "event_data": {}}}],
"1": [{"error_type": script._StopScript, "result": {"result": False}}],
"1/condition": [{"result": {"result": False}}],
"1/condition": [{"result": {"entities": ["test.entity"], "result": False}}],
},
expected_script_execution="aborted",
)
@ -1764,9 +1764,9 @@ async def test_repeat_var_in_condition(hass, condition):
},
],
"0/repeat/while/0": [
{"result": {"result": True}},
{"result": {"result": True}},
{"result": {"result": False}},
{"result": {"entities": [], "result": True}},
{"result": {"entities": [], "result": True}},
{"result": {"entities": [], "result": False}},
],
"0/repeat/sequence/0": [
{"result": {"event": "test_event", "event_data": {}}}
@ -1797,8 +1797,8 @@ async def test_repeat_var_in_condition(hass, condition):
},
],
"0/repeat/until/0": [
{"result": {"result": False}},
{"result": {"result": True}},
{"result": {"entities": [], "result": False}},
{"result": {"entities": [], "result": True}},
],
}
assert_action_trace(expected_trace)
@ -2058,10 +2058,14 @@ async def test_choose(hass, caplog, var, result):
expected_trace = {"0": [{"result": {"choice": expected_choice}}]}
if var >= 1:
expected_trace["0/choose/0"] = [{"result": {"result": var == 1}}]
expected_trace["0/choose/0/conditions/0"] = [{"result": {"result": var == 1}}]
expected_trace["0/choose/0/conditions/0"] = [
{"result": {"entities": [], "result": var == 1}}
]
if var >= 2:
expected_trace["0/choose/1"] = [{"result": {"result": var == 2}}]
expected_trace["0/choose/1/conditions/0"] = [{"result": {"result": var == 2}}]
expected_trace["0/choose/1/conditions/0"] = [
{"result": {"entities": [], "result": var == 2}}
]
if var == 1:
expected_trace["0/choose/0/sequence/0"] = [
{"result": {"event": "test_event", "event_data": {"choice": "first"}}}