jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-11 07:17:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix not condition validation and entity/device extraction (#34959)

Browse Source
This commit is contained in:
Franck Nijhof 2020-05-01 00:15:53 +02:00 committed by GitHub
parent 6fe00497d6
commit 928d9ec117
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 98 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
homeassistant/helpers/condition.py
View File

@ -536,7 +536,7 @@ async def async_validate_condition_config(
) -> ConfigType: ) -> ConfigType:
"""Validate config.""" """Validate config."""
condition = config[CONF_CONDITION] condition = config[CONF_CONDITION]
if condition in ("and", "or"): if condition in ("and", "not", "or"):
conditions = [] conditions = []
for sub_cond in config["conditions"]: for sub_cond in config["conditions"]:
sub_cond = await async_validate_condition_config(hass, sub_cond) sub_cond = await async_validate_condition_config(hass, sub_cond)
@ -563,7 +563,7 @@ def async_extract_entities(config: ConfigType) -> Set[str]:
config = to_process.popleft() config = to_process.popleft()
condition = config[CONF_CONDITION] condition = config[CONF_CONDITION]
if condition in ("and", "or"): if condition in ("and", "not", "or"):
to_process.extend(config["conditions"]) to_process.extend(config["conditions"])
continue continue
@ -585,7 +585,7 @@ def async_extract_devices(config: ConfigType) -> Set[str]:
config = to_process.popleft() config = to_process.popleft()
condition = config[CONF_CONDITION] condition = config[CONF_CONDITION]
if condition in ("and", "or"): if condition in ("and", "not", "or"):
to_process.extend(config["conditions"]) to_process.extend(config["conditions"])
continue continue

97
tests/helpers/test_condition.py
View File

@ -1,10 +1,31 @@
"""Test the condition helper.""" """Test the condition helper."""
from unittest.mock import patch from unittest.mock import patch
import pytest
from homeassistant.exceptions import HomeAssistantError
from homeassistant.helpers import condition from homeassistant.helpers import condition
from homeassistant.util import dt from homeassistant.util import dt
async def test_invalid_condition(hass):
"""Test if invalid condition raises."""
with pytest.raises(HomeAssistantError):
await condition.async_from_config(
hass,
{
"condition": "invalid",
"conditions": [
{
"condition": "state",
"entity_id": "sensor.temperature",
"state": "100",
},
],
},
)
async def test_and_condition(hass): async def test_and_condition(hass):
"""Test the 'and' condition.""" """Test the 'and' condition."""
test = await condition.async_from_config( test = await condition.async_from_config(
@ -261,9 +282,46 @@ async def test_extract_entities():
"entity_id": "sensor.temperature_2", "entity_id": "sensor.temperature_2",
"below": 110, "below": 110,
}, },
{
"condition": "not",
"conditions": [
{
"condition": "state",
"entity_id": "sensor.temperature_3",
"state": "100",
},
{
"condition": "numeric_state",
"entity_id": "sensor.temperature_4",
"below": 110,
},
],
},
{
"condition": "or",
"conditions": [
{
"condition": "state",
"entity_id": "sensor.temperature_5",
"state": "100",
},
{
"condition": "numeric_state",
"entity_id": "sensor.temperature_6",
"below": 110,
},
],
},
], ],
} }
) == {"sensor.temperature", "sensor.temperature_2"} ) == {
"sensor.temperature",
"sensor.temperature_2",
"sensor.temperature_3",
"sensor.temperature_4",
"sensor.temperature_5",
"sensor.temperature_6",
}
async def test_extract_devices(): async def test_extract_devices():
@ -274,6 +332,41 @@ async def test_extract_devices():
"conditions": [ "conditions": [
{"condition": "device", "device_id": "abcd", "domain": "light"}, {"condition": "device", "device_id": "abcd", "domain": "light"},
{"condition": "device", "device_id": "qwer", "domain": "switch"}, {"condition": "device", "device_id": "qwer", "domain": "switch"},
{
"condition": "state",
"entity_id": "sensor.not_a_device",
"state": "100",
},
{
"condition": "not",
"conditions": [
{
"condition": "device",
"device_id": "abcd_not",
"domain": "light",
},
{
"condition": "device",
"device_id": "qwer_not",
"domain": "switch",
},
],
},
{
"condition": "or",
"conditions": [
{
"condition": "device",
"device_id": "abcd_or",
"domain": "light",
},
{
"condition": "device",
"device_id": "qwer_or",
"domain": "switch",
},
],
},
], ],
} }
) == {"abcd", "qwer"} ) == {"abcd", "qwer", "abcd_not", "qwer_not", "abcd_or", "qwer_or"}