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

Allow number/sensor entities in numeric state conditions/triggers (#51439)

Browse Source
This commit is contained in:
Franck Nijhof 2021-06-04 18:14:48 +02:00 committed by GitHub
parent ede7932a57
commit 05241a7a68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 36 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
homeassistant/helpers/config_validation.py
View File

@ -926,7 +926,7 @@ SERVICE_SCHEMA = vol.All(
)
NUMERIC_STATE_THRESHOLD_SCHEMA = vol.Any(
vol.Coerce(float), vol.All(str, entity_domain("input_number"))
vol.Coerce(float), vol.All(str, entity_domain(["input_number", "number", "sensor"]))
)
CONDITION_BASE_SCHEMA = {vol.Optional(CONF_ALIAS): string}

42
tests/components/homeassistant/triggers/test_numeric_state.py
View File

@ -47,9 +47,13 @@ async def setup_comp(hass):
}
},
)
hass.states.async_set("number.value_10", 10)
hass.states.async_set("sensor.value_10", 10)
@pytest.mark.parametrize("below", (10, "input_number.value_10"))
@pytest.mark.parametrize(
"below", (10, "input_number.value_10", "number.value_10", "sensor.value_10")
)
async def test_if_not_fires_on_entity_removal(hass, calls, below):
"""Test the firing with removed entity."""
hass.states.async_set("test.entity", 11)
@ -75,7 +79,9 @@ async def test_if_not_fires_on_entity_removal(hass, calls, below):
assert len(calls) == 0
@pytest.mark.parametrize("below", (10, "input_number.value_10"))
@pytest.mark.parametrize(
"below", (10, "input_number.value_10", "number.value_10", "sensor.value_10")
)
async def test_if_fires_on_entity_change_below(hass, calls, below):
"""Test the firing with changed entity."""
hass.states.async_set("test.entity", 11)
@ -120,7 +126,9 @@ async def test_if_fires_on_entity_change_below(hass, calls, below):
assert calls[0].data["id"] == 0
@pytest.mark.parametrize("below", (10, "input_number.value_10"))
@pytest.mark.parametrize(
"below", (10, "input_number.value_10", "number.value_10", "sensor.value_10")
)
async def test_if_fires_on_entity_change_over_to_below(hass, calls, below):
"""Test the firing with changed entity."""
hass.states.async_set("test.entity", 11)
@ -147,7 +155,9 @@ async def test_if_fires_on_entity_change_over_to_below(hass, calls, below):
assert len(calls) == 1
@pytest.mark.parametrize("below", (10, "input_number.value_10"))
@pytest.mark.parametrize(
"below", (10, "input_number.value_10", "number.value_10", "sensor.value_10")
)
async def test_if_fires_on_entities_change_over_to_below(hass, calls, below):
"""Test the firing with changed entities."""
hass.states.async_set("test.entity_1", 11)
@ -178,7 +188,9 @@ async def test_if_fires_on_entities_change_over_to_below(hass, calls, below):
assert len(calls) == 2
@pytest.mark.parametrize("below", (10, "input_number.value_10"))
@pytest.mark.parametrize(
"below", (10, "input_number.value_10", "number.value_10", "sensor.value_10")
)
async def test_if_not_fires_on_entity_change_below_to_below(hass, calls, below):
"""Test the firing with changed entity."""
context = Context()
@ -217,7 +229,9 @@ async def test_if_not_fires_on_entity_change_below_to_below(hass, calls, below):
assert len(calls) == 1
@pytest.mark.parametrize("below", (10, "input_number.value_10"))
@pytest.mark.parametrize(
"below", (10, "input_number.value_10", "number.value_10", "sensor.value_10")
)
async def test_if_not_below_fires_on_entity_change_to_equal(hass, calls, below):
"""Test the firing with changed entity."""
hass.states.async_set("test.entity", 11)
@ -244,7 +258,9 @@ async def test_if_not_below_fires_on_entity_change_to_equal(hass, calls, below):
assert len(calls) == 0
@pytest.mark.parametrize("below", (10, "input_number.value_10"))
@pytest.mark.parametrize(
"below", (10, "input_number.value_10", "number.value_10", "sensor.value_10")
)
async def test_if_not_fires_on_initial_entity_below(hass, calls, below):
"""Test the firing when starting with a match."""
hass.states.async_set("test.entity", 9)
@ -271,7 +287,9 @@ async def test_if_not_fires_on_initial_entity_below(hass, calls, below):
assert len(calls) == 0
@pytest.mark.parametrize("above", (10, "input_number.value_10"))
@pytest.mark.parametrize(
"above", (10, "input_number.value_10", "number.value_10", "sensor.value_10")
)
async def test_if_not_fires_on_initial_entity_above(hass, calls, above):
"""Test the firing when starting with a match."""
hass.states.async_set("test.entity", 11)
@ -298,7 +316,9 @@ async def test_if_not_fires_on_initial_entity_above(hass, calls, above):
assert len(calls) == 0
@pytest.mark.parametrize("above", (10, "input_number.value_10"))
@pytest.mark.parametrize(
"above", (10, "input_number.value_10", "number.value_10", "sensor.value_10")
)
async def test_if_fires_on_entity_change_above(hass, calls, above):
"""Test the firing with changed entity."""
hass.states.async_set("test.entity", 9)
@ -1632,8 +1652,8 @@ def test_below_above():
)
def test_schema_input_number():
"""Test input_number only is accepted for above/below."""
def test_schema_unacceptable_entities():
"""Test input_number, number & sensor only is accepted for above/below."""
with pytest.raises(vol.Invalid):
numeric_state_trigger.TRIGGER_SCHEMA(
{

8
tests/helpers/test_condition.py
View File

@ -1265,12 +1265,12 @@ async def test_numeric_state_attribute(hass):
async def test_numeric_state_using_input_number(hass):
"""Test numeric_state conditions using input_number entities."""
hass.states.async_set("number.low", 10)
await async_setup_component(
hass,
"input_number",
{
"input_number": {
"low": {"min": 0, "max": 255, "initial": 10},
"high": {"min": 0, "max": 255, "initial": 100},
}
},
@ -1285,7 +1285,7 @@ async def test_numeric_state_using_input_number(hass):
"condition": "numeric_state",
"entity_id": "sensor.temperature",
"below": "input_number.high",
"above": "input_number.low",
"above": "number.low",
},
],
},
@ -1317,10 +1317,10 @@ async def test_numeric_state_using_input_number(hass):
)
assert test(hass)
hass.states.async_set("input_number.low", "unknown")
hass.states.async_set("number.low", "unknown")
assert not test(hass)
hass.states.async_set("input_number.low", "unavailable")
hass.states.async_set("number.low", "unavailable")
assert not test(hass)
with pytest.raises(ConditionError):