Home-Assistant/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2026-08-19 12:48:57 +01:00
Code Activity

Use the correct schema for triggers/conditions "for" option (#169539)

Browse Source
This commit is contained in:
Abílio Costa
2026-04-30 16:52:49 +02:00
committed by GitHub
parent b0e18e432e
commit 84b2f952be
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
homeassistant/helpers/condition.py
+1 -1
View File
@@ -437,7 +437,7 @@ ENTITY_STATE_CONDITION_SCHEMA_ANY_ALL_FOR = (
ENTITY_STATE_CONDITION_SCHEMA_ANY_ALL.extend(
{
vol.Required(CONF_OPTIONS, default={}): {
vol.Optional(CONF_FOR): cv.positive_time_period_dict,
vol.Optional(CONF_FOR): cv.positive_time_period,
},
}
)
homeassistant/helpers/trigger.py
+1 -1
View File
@@ -345,7 +345,7 @@ ENTITY_STATE_TRIGGER_SCHEMA_FIRST_LAST = ENTITY_STATE_TRIGGER_SCHEMA.extend(
vol.Required(ATTR_BEHAVIOR, default=BEHAVIOR_ANY): vol.In(
[BEHAVIOR_FIRST, BEHAVIOR_LAST, BEHAVIOR_ANY]
),
vol.Optional(CONF_FOR): cv.positive_time_period_dict,
vol.Optional(CONF_FOR): cv.positive_time_period,
},
}
)
tests/components/common.py
+8 -6
View File
@@ -1167,9 +1167,10 @@ async def assert_condition_options_supported(
)
# Duration
await _validate_condition_options(
hass, condition, _merge({"for": {"seconds": 5}}), valid=supports_duration
)
for for_value in ({"seconds": 5}, "00:00:05", 5):
await _validate_condition_options(
hass, condition, _merge({"for": for_value}), valid=supports_duration
)
# Unknown option should always be rejected
await _validate_condition_options(
@@ -1230,9 +1231,10 @@ async def assert_trigger_options_supported(
)
# Duration
await _validate_trigger_options(
hass, trigger, _merge({"for": {"seconds": 5}}), valid=supports_duration
)
for for_value in ({"seconds": 5}, "00:00:05", 5):
await _validate_trigger_options(
hass, trigger, _merge({"for": for_value}), valid=supports_duration
)
# Unknown option should always be rejected
await _validate_trigger_options(