Use "arming" state during transition in manual alarm panel (#32950)

* Manual Alarm Control Panel: use proper "Arming" state

* Update previous and next attributes

* add CONF_ARMING_TIME

* Split up arming and pending time, pending_time --> arming_time

* update tests

* fix issort

* fix issort

* fix demo platform

* fix alarm test

* remove arming_time from the triggered state

* Match previous default "delay_time"

* fix tests

* fix arming state when triggering

* fix arming _arming_time_by_state for Triggering state

* change to not in list

* Update homeassistant/components/manual/alarm_control_panel.py

Co-Authored-By: Martin Hjelmare <marhje52@gmail.com>

* async_update_ha_state -> async_write_ha_state

* black formatting

* add Callback

Co-Authored-By: Martin Hjelmare <marhje52@gmail.com>

* import callback

* update device triggers alarm_control_panel

* Update test_device_trigger.py

* Update device_trigger.py

Co-authored-by: Martin Hjelmare <marhje52@gmail.com>
This commit is contained in:
starkillerOGandMartin Hjelmare authored and GitHub committed 2020-04-24 00:07:07 +02:00
1 parent e9c5f3e74a
commit 7bfc1d2840
6 files changed
+171 -131

No files matched your search

@@ -9,6 +9,7 @@ from homeassistant.const import (
STATE_ALARM_ARMED_CUSTOM_BYPASS,
STATE_ALARM_ARMED_HOME,
STATE_ALARM_ARMED_NIGHT,
STATE_ALARM_ARMING,
STATE_ALARM_DISARMED,
STATE_ALARM_PENDING,
STATE_ALARM_TRIGGERED,
@@ -41,7 +42,7 @@ async def test_arm_home_no_pending(hass):
"platform": "manual",
"name": "test",
"code": CODE,
"pending_time": 0,
"arming_time": 0,
"disarm_after_trigger": False,
}
},
@@ -67,7 +68,7 @@ async def test_arm_home_no_pending_when_code_not_req(hass):
"name": "test",
"code": CODE,
"code_arm_required": False,
"pending_time": 0,
"arming_time": 0,
"disarm_after_trigger": False,
}
},
@@ -92,7 +93,7 @@ async def test_arm_home_with_pending(hass):
"platform": "manual",
"name": "test",
"code": CODE,
"pending_time": 1,
"arming_time": 1,
"disarm_after_trigger": False,
}
},
@@ -104,10 +105,10 @@ async def test_arm_home_with_pending(hass):
await common.async_alarm_arm_home(hass, CODE, entity_id)
assert STATE_ALARM_PENDING == hass.states.get(entity_id).state
assert STATE_ALARM_ARMING == hass.states.get(entity_id).state
state = hass.states.get(entity_id)
assert state.attributes["post_pending_state"] == STATE_ALARM_ARMED_HOME
assert state.attributes["next_state"] == STATE_ALARM_ARMED_HOME
future = dt_util.utcnow() + timedelta(seconds=1)
with patch(
@@ -131,7 +132,7 @@ async def test_arm_home_with_invalid_code(hass):
"platform": "manual",
"name": "test",
"code": CODE,
"pending_time": 1,
"arming_time": 1,
"disarm_after_trigger": False,
}
},
@@ -156,7 +157,7 @@ async def test_arm_away_no_pending(hass):
"platform": "manual",
"name": "test",
"code": CODE,
"pending_time": 0,
"arming_time": 0,
"disarm_after_trigger": False,
}
},
@@ -182,7 +183,7 @@ async def test_arm_away_no_pending_when_code_not_req(hass):
"name": "test",
"code": CODE,
"code_arm_required": False,
"pending_time": 0,
"arming_time": 0,
"disarm_after_trigger": False,
}
},
@@ -207,7 +208,7 @@ async def test_arm_home_with_template_code(hass):
"platform": "manual",
"name": "test",
"code_template": '{{ "abc" }}',
"pending_time": 0,
"arming_time": 0,
"disarm_after_trigger": False,
}
},
@@ -233,7 +234,7 @@ async def test_arm_away_with_pending(hass):
"platform": "manual",
"name": "test",
"code": CODE,
"pending_time": 1,
"arming_time": 1,
"disarm_after_trigger": False,
}
},
@@ -245,10 +246,10 @@ async def test_arm_away_with_pending(hass):
await common.async_alarm_arm_away(hass, CODE)
assert STATE_ALARM_PENDING == hass.states.get(entity_id).state
assert STATE_ALARM_ARMING == hass.states.get(entity_id).state
state = hass.states.get(entity_id)
assert state.attributes["post_pending_state"] == STATE_ALARM_ARMED_AWAY
assert state.attributes["next_state"] == STATE_ALARM_ARMED_AWAY
future = dt_util.utcnow() + timedelta(seconds=1)
with patch(
@@ -272,7 +273,7 @@ async def test_arm_away_with_invalid_code(hass):
"platform": "manual",
"name": "test",
"code": CODE,
"pending_time": 1,
"arming_time": 1,
"disarm_after_trigger": False,
}
},
@@ -297,7 +298,7 @@ async def test_arm_night_no_pending(hass):
"platform": "manual",
"name": "test",
"code": CODE,
"pending_time": 0,
"arming_time": 0,
"disarm_after_trigger": False,
}
},
@@ -323,7 +324,7 @@ async def test_arm_night_no_pending_when_code_not_req(hass):
"name": "test",
"code": CODE,
"code_arm_required": False,
"pending_time": 0,
"arming_time": 0,
"disarm_after_trigger": False,
}
},
@@ -348,7 +349,7 @@ async def test_arm_night_with_pending(hass):
"platform": "manual",
"name": "test",
"code": CODE,
"pending_time": 1,
"arming_time": 1,
"disarm_after_trigger": False,
}
},
@@ -360,10 +361,10 @@ async def test_arm_night_with_pending(hass):
await common.async_alarm_arm_night(hass, CODE, entity_id)
assert STATE_ALARM_PENDING == hass.states.get(entity_id).state
assert STATE_ALARM_ARMING == hass.states.get(entity_id).state
state = hass.states.get(entity_id)
assert state.attributes["post_pending_state"] == STATE_ALARM_ARMED_NIGHT
assert state.attributes["next_state"] == STATE_ALARM_ARMED_NIGHT
future = dt_util.utcnow() + timedelta(seconds=1)
with patch(
@@ -392,7 +393,7 @@ async def test_arm_night_with_invalid_code(hass):
"platform": "manual",
"name": "test",
"code": CODE,
"pending_time": 1,
"arming_time": 1,
"disarm_after_trigger": False,
}
},
@@ -452,7 +453,7 @@ async def test_trigger_with_delay(hass):
"name": "test",
"code": CODE,
"delay_time": 1,
"pending_time": 0,
"arming_time": 0,
"disarm_after_trigger": False,
}
},
@@ -470,7 +471,7 @@ async def test_trigger_with_delay(hass):
state = hass.states.get(entity_id)
assert STATE_ALARM_PENDING == state.state
assert STATE_ALARM_TRIGGERED == state.attributes["post_pending_state"]
assert STATE_ALARM_TRIGGERED == state.attributes["next_state"]
future = dt_util.utcnow() + timedelta(seconds=1)
with patch(
@@ -493,7 +494,7 @@ async def test_trigger_zero_trigger_time(hass):
"alarm_control_panel": {
"platform": "manual",
"name": "test",
"pending_time": 0,
"arming_time": 0,
"trigger_time": 0,
"disarm_after_trigger": False,
}
@@ -518,7 +519,7 @@ async def test_trigger_zero_trigger_time_with_pending(hass):
"alarm_control_panel": {
"platform": "manual",
"name": "test",
"pending_time": 2,
"arming_time": 2,
"trigger_time": 0,
"disarm_after_trigger": False,
}
@@ -543,7 +544,7 @@ async def test_trigger_with_pending(hass):
"alarm_control_panel": {
"platform": "manual",
"name": "test",
"pending_time": 2,
"delay_time": 2,
"trigger_time": 3,
"disarm_after_trigger": False,
}
@@ -559,7 +560,7 @@ async def test_trigger_with_pending(hass):
assert STATE_ALARM_PENDING == hass.states.get(entity_id).state
state = hass.states.get(entity_id)
assert state.attributes["post_pending_state"] == STATE_ALARM_TRIGGERED
assert state.attributes["next_state"] == STATE_ALARM_TRIGGERED
future = dt_util.utcnow() + timedelta(seconds=2)
with patch(
@@ -595,7 +596,7 @@ async def test_trigger_with_unused_specific_delay(hass):
"name": "test",
"code": CODE,
"delay_time": 5,
"pending_time": 0,
"arming_time": 0,
"armed_home": {"delay_time": 10},
"disarm_after_trigger": False,
}
@@ -614,7 +615,7 @@ async def test_trigger_with_unused_specific_delay(hass):
state = hass.states.get(entity_id)
assert STATE_ALARM_PENDING == state.state
assert STATE_ALARM_TRIGGERED == state.attributes["post_pending_state"]
assert STATE_ALARM_TRIGGERED == state.attributes["next_state"]
future = dt_util.utcnow() + timedelta(seconds=5)
with patch(
@@ -639,7 +640,7 @@ async def test_trigger_with_specific_delay(hass):
"name": "test",
"code": CODE,
"delay_time": 10,
"pending_time": 0,
"arming_time": 0,
"armed_away": {"delay_time": 1},
"disarm_after_trigger": False,
}
@@ -658,7 +659,7 @@ async def test_trigger_with_specific_delay(hass):
state = hass.states.get(entity_id)
assert STATE_ALARM_PENDING == state.state
assert STATE_ALARM_TRIGGERED == state.attributes["post_pending_state"]
assert STATE_ALARM_TRIGGERED == state.attributes["next_state"]
future = dt_util.utcnow() + timedelta(seconds=1)
with patch(
@@ -682,9 +683,8 @@ async def test_trigger_with_pending_and_delay(hass):
"platform": "manual",
"name": "test",
"code": CODE,
"delay_time": 1,
"pending_time": 0,
"triggered": {"pending_time": 1},
"delay_time": 2,
"arming_time": 0,
"disarm_after_trigger": False,
}
},
@@ -702,7 +702,7 @@ async def test_trigger_with_pending_and_delay(hass):
state = hass.states.get(entity_id)
assert state.state == STATE_ALARM_PENDING
assert state.attributes["post_pending_state"] == STATE_ALARM_TRIGGERED
assert state.attributes["next_state"] == STATE_ALARM_TRIGGERED
future = dt_util.utcnow() + timedelta(seconds=1)
with patch(
@@ -714,7 +714,7 @@ async def test_trigger_with_pending_and_delay(hass):
state = hass.states.get(entity_id)
assert state.state == STATE_ALARM_PENDING
assert state.attributes["post_pending_state"] == STATE_ALARM_TRIGGERED
assert state.attributes["next_state"] == STATE_ALARM_TRIGGERED
future += timedelta(seconds=1)
with patch(
@@ -739,9 +739,8 @@ async def test_trigger_with_pending_and_specific_delay(hass):
"name": "test",
"code": CODE,
"delay_time": 10,
"pending_time": 0,
"armed_away": {"delay_time": 1},
"triggered": {"pending_time": 1},
"arming_time": 0,
"armed_away": {"delay_time": 2},
"disarm_after_trigger": False,
}
},
@@ -759,7 +758,7 @@ async def test_trigger_with_pending_and_specific_delay(hass):
state = hass.states.get(entity_id)
assert state.state == STATE_ALARM_PENDING
assert state.attributes["post_pending_state"] == STATE_ALARM_TRIGGERED
assert state.attributes["next_state"] == STATE_ALARM_TRIGGERED
future = dt_util.utcnow() + timedelta(seconds=1)
with patch(
@@ -771,7 +770,7 @@ async def test_trigger_with_pending_and_specific_delay(hass):
state = hass.states.get(entity_id)
assert state.state == STATE_ALARM_PENDING
assert state.attributes["post_pending_state"] == STATE_ALARM_TRIGGERED
assert state.attributes["next_state"] == STATE_ALARM_TRIGGERED
future += timedelta(seconds=1)
with patch(
@@ -794,8 +793,8 @@ async def test_armed_home_with_specific_pending(hass):
"alarm_control_panel": {
"platform": "manual",
"name": "test",
"pending_time": 10,
"armed_home": {"pending_time": 2},
"arming_time": 10,
"armed_home": {"arming_time": 2},
}
},
)
@@ -804,7 +803,7 @@ async def test_armed_home_with_specific_pending(hass):
await common.async_alarm_arm_home(hass)
assert STATE_ALARM_PENDING == hass.states.get(entity_id).state
assert STATE_ALARM_ARMING == hass.states.get(entity_id).state
future = dt_util.utcnow() + timedelta(seconds=2)
with patch(
@@ -826,8 +825,8 @@ async def test_armed_away_with_specific_pending(hass):
"alarm_control_panel": {
"platform": "manual",
"name": "test",
"pending_time": 10,
"armed_away": {"pending_time": 2},
"arming_time": 10,
"armed_away": {"arming_time": 2},
}
},
)
@@ -836,7 +835,7 @@ async def test_armed_away_with_specific_pending(hass):
await common.async_alarm_arm_away(hass)
assert STATE_ALARM_PENDING == hass.states.get(entity_id).state
assert STATE_ALARM_ARMING == hass.states.get(entity_id).state
future = dt_util.utcnow() + timedelta(seconds=2)
with patch(
@@ -858,8 +857,8 @@ async def test_armed_night_with_specific_pending(hass):
"alarm_control_panel": {
"platform": "manual",
"name": "test",
"pending_time": 10,
"armed_night": {"pending_time": 2},
"arming_time": 10,
"armed_night": {"arming_time": 2},
}
},
)
@@ -868,7 +867,7 @@ async def test_armed_night_with_specific_pending(hass):
await common.async_alarm_arm_night(hass)
assert STATE_ALARM_PENDING == hass.states.get(entity_id).state
assert STATE_ALARM_ARMING == hass.states.get(entity_id).state
future = dt_util.utcnow() + timedelta(seconds=2)
with patch(
@@ -890,8 +889,8 @@ async def test_trigger_with_specific_pending(hass):
"alarm_control_panel": {
"platform": "manual",
"name": "test",
"pending_time": 10,
"triggered": {"pending_time": 2},
"delay_time": 10,
"disarmed": {"delay_time": 2},
"trigger_time": 3,
"disarm_after_trigger": False,
}
@@ -935,7 +934,7 @@ async def test_trigger_with_disarm_after_trigger(hass):
"platform": "manual",
"name": "test",
"trigger_time": 5,
"pending_time": 0,
"delay_time": 0,
"disarm_after_trigger": True,
}
},
@@ -971,7 +970,7 @@ async def test_trigger_with_zero_specific_trigger_time(hass):
"name": "test",
"trigger_time": 5,
"disarmed": {"trigger_time": 0},
"pending_time": 0,
"arming_time": 0,
"disarm_after_trigger": True,
}
},
@@ -997,7 +996,7 @@ async def test_trigger_with_unused_zero_specific_trigger_time(hass):
"name": "test",
"trigger_time": 5,
"armed_home": {"trigger_time": 0},
"pending_time": 0,
"delay_time": 0,
"disarm_after_trigger": True,
}
},
@@ -1032,7 +1031,7 @@ async def test_trigger_with_specific_trigger_time(hass):
"platform": "manual",
"name": "test",
"disarmed": {"trigger_time": 5},
"pending_time": 0,
"delay_time": 0,
"disarm_after_trigger": True,
}
},
@@ -1067,7 +1066,8 @@ async def test_trigger_with_no_disarm_after_trigger(hass):
"platform": "manual",
"name": "test",
"trigger_time": 5,
"pending_time": 0,
"arming_time": 0,
"delay_time": 0,
"disarm_after_trigger": False,
}
},
@@ -1106,7 +1106,8 @@ async def test_back_to_back_trigger_with_no_disarm_after_trigger(hass):
"platform": "manual",
"name": "test",
"trigger_time": 5,
"pending_time": 0,
"arming_time": 0,
"delay_time": 0,
"disarm_after_trigger": False,
}
},
@@ -1196,7 +1197,7 @@ async def test_disarm_during_trigger_with_invalid_code(hass):
"alarm_control_panel": {
"platform": "manual",
"name": "test",
"pending_time": 5,
"delay_time": 5,
"code": CODE + "2",
"disarm_after_trigger": False,
}
@@ -1236,7 +1237,7 @@ async def test_disarm_with_template_code(hass):
"platform": "manual",
"name": "test",
"code_template": '{{ "" if from_state == "disarmed" else "abc" }}',
"pending_time": 0,
"arming_time": 0,
"disarm_after_trigger": False,
}
},
@@ -1272,7 +1273,7 @@ async def test_arm_custom_bypass_no_pending(hass):
"platform": "manual",
"name": "test",
"code": CODE,
"pending_time": 0,
"arming_time": 0,
"disarm_after_trigger": False,
}
},
@@ -1298,7 +1299,7 @@ async def test_arm_custom_bypass_no_pending_when_code_not_req(hass):
"name": "test",
"code": CODE,
"code_arm_required": False,
"pending_time": 0,
"arming_time": 0,
"disarm_after_trigger": False,
}
},
@@ -1323,7 +1324,7 @@ async def test_arm_custom_bypass_with_pending(hass):
"platform": "manual",
"name": "test",
"code": CODE,
"pending_time": 1,
"arming_time": 1,
"disarm_after_trigger": False,
}
},
@@ -1335,10 +1336,10 @@ async def test_arm_custom_bypass_with_pending(hass):
await common.async_alarm_arm_custom_bypass(hass, CODE, entity_id)
assert STATE_ALARM_PENDING == hass.states.get(entity_id).state
assert STATE_ALARM_ARMING == hass.states.get(entity_id).state
state = hass.states.get(entity_id)
assert state.attributes["post_pending_state"] == STATE_ALARM_ARMED_CUSTOM_BYPASS
assert state.attributes["next_state"] == STATE_ALARM_ARMED_CUSTOM_BYPASS
future = dt_util.utcnow() + timedelta(seconds=1)
with patch(
@@ -1362,7 +1363,7 @@ async def test_arm_custom_bypass_with_invalid_code(hass):
"platform": "manual",
"name": "test",
"code": CODE,
"pending_time": 1,
"arming_time": 1,
"disarm_after_trigger": False,
}
},
@@ -1386,8 +1387,8 @@ async def test_armed_custom_bypass_with_specific_pending(hass):
"alarm_control_panel": {
"platform": "manual",
"name": "test",
"pending_time": 10,
"armed_custom_bypass": {"pending_time": 2},
"arming_time": 10,
"armed_custom_bypass": {"arming_time": 2},
}
},
)
@@ -1396,7 +1397,7 @@ async def test_armed_custom_bypass_with_specific_pending(hass):
await common.async_alarm_arm_custom_bypass(hass)
assert STATE_ALARM_PENDING == hass.states.get(entity_id).state
assert STATE_ALARM_ARMING == hass.states.get(entity_id).state
future = dt_util.utcnow() + timedelta(seconds=2)
with patch(
@@ -1419,9 +1420,9 @@ async def test_arm_away_after_disabled_disarmed(hass):
"platform": "manual",
"name": "test",
"code": CODE,
"pending_time": 0,
"arming_time": 0,
"delay_time": 1,
"armed_away": {"pending_time": 1},
"armed_away": {"arming_time": 1},
"disarmed": {"trigger_time": 0},
"disarm_after_trigger": False,
}
@@ -1435,16 +1436,16 @@ async def test_arm_away_after_disabled_disarmed(hass):
await common.async_alarm_arm_away(hass, CODE)
state = hass.states.get(entity_id)
assert STATE_ALARM_PENDING == state.state
assert STATE_ALARM_DISARMED == state.attributes["pre_pending_state"]
assert STATE_ALARM_ARMED_AWAY == state.attributes["post_pending_state"]
assert STATE_ALARM_ARMING == state.state
assert STATE_ALARM_DISARMED == state.attributes["previous_state"]
assert STATE_ALARM_ARMED_AWAY == state.attributes["next_state"]
await common.async_alarm_trigger(hass, entity_id=entity_id)
state = hass.states.get(entity_id)
assert STATE_ALARM_PENDING == state.state
assert STATE_ALARM_DISARMED == state.attributes["pre_pending_state"]
assert STATE_ALARM_ARMED_AWAY == state.attributes["post_pending_state"]
assert STATE_ALARM_ARMING == state.state
assert STATE_ALARM_DISARMED == state.attributes["previous_state"]
assert STATE_ALARM_ARMED_AWAY == state.attributes["next_state"]
future = dt_util.utcnow() + timedelta(seconds=1)
with patch(
@@ -1461,8 +1462,8 @@ async def test_arm_away_after_disabled_disarmed(hass):
state = hass.states.get(entity_id)
assert STATE_ALARM_PENDING == state.state
assert STATE_ALARM_ARMED_AWAY == state.attributes["pre_pending_state"]
assert STATE_ALARM_TRIGGERED == state.attributes["post_pending_state"]
assert STATE_ALARM_ARMED_AWAY == state.attributes["previous_state"]
assert STATE_ALARM_TRIGGERED == state.attributes["next_state"]
future += timedelta(seconds=1)
with patch(
@@ -1492,7 +1493,7 @@ async def test_restore_armed_state(hass):
"alarm_control_panel": {
"platform": "manual",
"name": "test",
"pending_time": 0,
"arming_time": 0,
"trigger_time": 0,
"disarm_after_trigger": False,
}
@@ -1518,7 +1519,7 @@ async def test_restore_disarmed_state(hass):
"alarm_control_panel": {
"platform": "manual",
"name": "test",
"pending_time": 0,
"arming_time": 0,
"trigger_time": 0,
"disarm_after_trigger": False,
}