github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-09-24 13:34:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into integration

Browse Source 
# Conflicts:
#	esphome/components/fan/fan_traits.h
#	esphome/components/http_request/ota/ota_http_request.cpp
#	tests/integration/test_alarm_control_panel_state_transitions.py
This commit is contained in:
J. Nick Koston
2025-12-19 14:22:19 -10:00
parent 3fff2f2f0a c9fccdff25
commit 94fcd18306
15 changed files with 97 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/integration/test_alarm_control_panel_state_transitions.py
+2 -2
View File
@@ -237,13 +237,13 @@ async def test_alarm_control_panel_state_transitions(
# Should go to PENDING (delayed sensor)
await wait_for_state(AlarmControlPanelState.PENDING)
# Should go to TRIGGERED after pending_time (100ms)
# Should go to TRIGGERED after pending_time (50ms)
await wait_for_state(AlarmControlPanelState.TRIGGERED)
# Close the sensor
client.switch_command(door_switch_info.key, False)
# Wait for trigger_time to expire and auto-reset (500ms)
# Wait for trigger_time to expire and auto-reset (100ms)
# The alarm should go back to ARMED_AWAY after trigger_time
# This transition FROM TRIGGERED fires on_cleared
await wait_for_state(AlarmControlPanelState.ARMED_AWAY, timeout=2.0)