Added support for ARM_NIGHT for manual_mqtt alarm (#9358)
* - Added support for ARM_NIGHT for manual_mqtt alarm * - port "Add post_pending_state attribute to manual alarm_control_panel #9291" to manuql_mqtt * - port "Fixed manual alarm not re-arm after 2nd trigger #9249" to manuql_mqtt * - port "Add manual alarm_control_panel pending time per state #9264" to manuql_mqtt * - Updated test_trigger_with_specific_pending to simulate real scenario e.g. arm the system then trigger
This commit is contained in:
Joe Lu
Martin Hjelmare
parent
84524e0712
commit
bbf6e9ea47
2 changed files with 453 additions and 36 deletions
|
|
@ -6,7 +6,7 @@ from unittest.mock import patch
|
|||
from homeassistant.setup import setup_component
|
||||
from homeassistant.const import (
|
||||
STATE_ALARM_DISARMED, STATE_ALARM_ARMED_HOME, STATE_ALARM_ARMED_AWAY,
|
||||
STATE_ALARM_PENDING, STATE_ALARM_TRIGGERED)
|
||||
STATE_ALARM_ARMED_NIGHT, STATE_ALARM_PENDING, STATE_ALARM_TRIGGERED)
|
||||
from homeassistant.components import alarm_control_panel
|
||||
import homeassistant.util.dt as dt_util
|
||||
|
||||
|
|
@ -100,6 +100,11 @@ class TestAlarmControlPanelManualMqtt(unittest.TestCase):
|
|||
self.assertEqual(STATE_ALARM_PENDING,
|
||||
self.hass.states.get(entity_id).state)
|
||||
|
||||
self.assertTrue(
|
||||
self.hass.states.is_state_attr(entity_id,
|
||||
'post_pending_state',
|
||||
STATE_ALARM_ARMED_HOME))
|
||||
|
||||
future = dt_util.utcnow() + timedelta(seconds=1)
|
||||
with patch(('homeassistant.components.alarm_control_panel.manual_mqtt.'
|
||||
'dt_util.utcnow'), return_value=future):
|
||||
|
|
@ -184,6 +189,11 @@ class TestAlarmControlPanelManualMqtt(unittest.TestCase):
|
|||
self.assertEqual(STATE_ALARM_PENDING,
|
||||
self.hass.states.get(entity_id).state)
|
||||
|
||||
self.assertTrue(
|
||||
self.hass.states.is_state_attr(entity_id,
|
||||
'post_pending_state',
|
||||
STATE_ALARM_ARMED_AWAY))
|
||||
|
||||
future = dt_util.utcnow() + timedelta(seconds=1)
|
||||
with patch(('homeassistant.components.alarm_control_panel.manual_mqtt.'
|
||||
'dt_util.utcnow'), return_value=future):
|
||||
|
|
@ -218,6 +228,95 @@ class TestAlarmControlPanelManualMqtt(unittest.TestCase):
|
|||
self.assertEqual(STATE_ALARM_DISARMED,
|
||||
self.hass.states.get(entity_id).state)
|
||||
|
||||
def test_arm_night_no_pending(self):
|
||||
"""Test arm night method."""
|
||||
self.assertTrue(setup_component(
|
||||
self.hass, alarm_control_panel.DOMAIN,
|
||||
{'alarm_control_panel': {
|
||||
'platform': 'manual_mqtt',
|
||||
'name': 'test',
|
||||
'code': CODE,
|
||||
'pending_time': 0,
|
||||
'disarm_after_trigger': False,
|
||||
'command_topic': 'alarm/command',
|
||||
'state_topic': 'alarm/state',
|
||||
}}))
|
||||
|
||||
entity_id = 'alarm_control_panel.test'
|
||||
|
||||
self.assertEqual(STATE_ALARM_DISARMED,
|
||||
self.hass.states.get(entity_id).state)
|
||||
|
||||
alarm_control_panel.alarm_arm_night(self.hass, CODE, entity_id)
|
||||
self.hass.block_till_done()
|
||||
|
||||
self.assertEqual(STATE_ALARM_ARMED_NIGHT,
|
||||
self.hass.states.get(entity_id).state)
|
||||
|
||||
def test_arm_night_with_pending(self):
|
||||
"""Test arm night method."""
|
||||
self.assertTrue(setup_component(
|
||||
self.hass, alarm_control_panel.DOMAIN,
|
||||
{'alarm_control_panel': {
|
||||
'platform': 'manual_mqtt',
|
||||
'name': 'test',
|
||||
'code': CODE,
|
||||
'pending_time': 1,
|
||||
'disarm_after_trigger': False,
|
||||
'command_topic': 'alarm/command',
|
||||
'state_topic': 'alarm/state',
|
||||
}}))
|
||||
|
||||
entity_id = 'alarm_control_panel.test'
|
||||
|
||||
self.assertEqual(STATE_ALARM_DISARMED,
|
||||
self.hass.states.get(entity_id).state)
|
||||
|
||||
alarm_control_panel.alarm_arm_night(self.hass, CODE)
|
||||
self.hass.block_till_done()
|
||||
|
||||
self.assertEqual(STATE_ALARM_PENDING,
|
||||
self.hass.states.get(entity_id).state)
|
||||
|
||||
self.assertTrue(
|
||||
self.hass.states.is_state_attr(entity_id,
|
||||
'post_pending_state',
|
||||
STATE_ALARM_ARMED_NIGHT))
|
||||
|
||||
future = dt_util.utcnow() + timedelta(seconds=1)
|
||||
with patch(('homeassistant.components.alarm_control_panel.manual_mqtt.'
|
||||
'dt_util.utcnow'), return_value=future):
|
||||
fire_time_changed(self.hass, future)
|
||||
self.hass.block_till_done()
|
||||
|
||||
self.assertEqual(STATE_ALARM_ARMED_NIGHT,
|
||||
self.hass.states.get(entity_id).state)
|
||||
|
||||
def test_arm_night_with_invalid_code(self):
|
||||
"""Attempt to arm night without a valid code."""
|
||||
self.assertTrue(setup_component(
|
||||
self.hass, alarm_control_panel.DOMAIN,
|
||||
{'alarm_control_panel': {
|
||||
'platform': 'manual_mqtt',
|
||||
'name': 'test',
|
||||
'code': CODE,
|
||||
'pending_time': 1,
|
||||
'disarm_after_trigger': False,
|
||||
'command_topic': 'alarm/command',
|
||||
'state_topic': 'alarm/state',
|
||||
}}))
|
||||
|
||||
entity_id = 'alarm_control_panel.test'
|
||||
|
||||
self.assertEqual(STATE_ALARM_DISARMED,
|
||||
self.hass.states.get(entity_id).state)
|
||||
|
||||
alarm_control_panel.alarm_arm_night(self.hass, CODE + '2')
|
||||
self.hass.block_till_done()
|
||||
|
||||
self.assertEqual(STATE_ALARM_DISARMED,
|
||||
self.hass.states.get(entity_id).state)
|
||||
|
||||
def test_trigger_no_pending(self):
|
||||
"""Test triggering when no pending submitted method."""
|
||||
self.assertTrue(setup_component(
|
||||
|
|
@ -276,6 +375,11 @@ class TestAlarmControlPanelManualMqtt(unittest.TestCase):
|
|||
self.assertEqual(STATE_ALARM_PENDING,
|
||||
self.hass.states.get(entity_id).state)
|
||||
|
||||
self.assertTrue(
|
||||
self.hass.states.is_state_attr(entity_id,
|
||||
'post_pending_state',
|
||||
STATE_ALARM_TRIGGERED))
|
||||
|
||||
future = dt_util.utcnow() + timedelta(seconds=2)
|
||||
with patch(('homeassistant.components.alarm_control_panel.manual_mqtt.'
|
||||
'dt_util.utcnow'), return_value=future):
|
||||
|
|
@ -328,6 +432,61 @@ class TestAlarmControlPanelManualMqtt(unittest.TestCase):
|
|||
self.assertEqual(STATE_ALARM_DISARMED,
|
||||
self.hass.states.get(entity_id).state)
|
||||
|
||||
def test_back_to_back_trigger_with_no_disarm_after_trigger(self):
|
||||
"""Test no disarm after back to back trigger."""
|
||||
self.assertTrue(setup_component(
|
||||
self.hass, alarm_control_panel.DOMAIN,
|
||||
{'alarm_control_panel': {
|
||||
'platform': 'manual_mqtt',
|
||||
'name': 'test',
|
||||
'trigger_time': 5,
|
||||
'pending_time': 0,
|
||||
'disarm_after_trigger': False,
|
||||
'command_topic': 'alarm/command',
|
||||
'state_topic': 'alarm/state',
|
||||
}}))
|
||||
|
||||
entity_id = 'alarm_control_panel.test'
|
||||
|
||||
self.assertEqual(STATE_ALARM_DISARMED,
|
||||
self.hass.states.get(entity_id).state)
|
||||
|
||||
alarm_control_panel.alarm_arm_away(self.hass, CODE, entity_id)
|
||||
self.hass.block_till_done()
|
||||
|
||||
self.assertEqual(STATE_ALARM_ARMED_AWAY,
|
||||
self.hass.states.get(entity_id).state)
|
||||
|
||||
alarm_control_panel.alarm_trigger(self.hass, entity_id=entity_id)
|
||||
self.hass.block_till_done()
|
||||
|
||||
self.assertEqual(STATE_ALARM_TRIGGERED,
|
||||
self.hass.states.get(entity_id).state)
|
||||
|
||||
future = dt_util.utcnow() + timedelta(seconds=5)
|
||||
with patch(('homeassistant.components.alarm_control_panel.manual_mqtt.'
|
||||
'dt_util.utcnow'), return_value=future):
|
||||
fire_time_changed(self.hass, future)
|
||||
self.hass.block_till_done()
|
||||
|
||||
self.assertEqual(STATE_ALARM_ARMED_AWAY,
|
||||
self.hass.states.get(entity_id).state)
|
||||
|
||||
alarm_control_panel.alarm_trigger(self.hass, entity_id=entity_id)
|
||||
self.hass.block_till_done()
|
||||
|
||||
self.assertEqual(STATE_ALARM_TRIGGERED,
|
||||
self.hass.states.get(entity_id).state)
|
||||
|
||||
future = dt_util.utcnow() + timedelta(seconds=5)
|
||||
with patch(('homeassistant.components.alarm_control_panel.manual_mqtt.'
|
||||
'dt_util.utcnow'), return_value=future):
|
||||
fire_time_changed(self.hass, future)
|
||||
self.hass.block_till_done()
|
||||
|
||||
self.assertEqual(STATE_ALARM_ARMED_AWAY,
|
||||
self.hass.states.get(entity_id).state)
|
||||
|
||||
def test_disarm_while_pending_trigger(self):
|
||||
"""Test disarming while pending state."""
|
||||
self.assertTrue(setup_component(
|
||||
|
|
@ -407,6 +566,160 @@ class TestAlarmControlPanelManualMqtt(unittest.TestCase):
|
|||
self.assertEqual(STATE_ALARM_TRIGGERED,
|
||||
self.hass.states.get(entity_id).state)
|
||||
|
||||
def test_armed_home_with_specific_pending(self):
|
||||
"""Test arm home method."""
|
||||
self.assertTrue(setup_component(
|
||||
self.hass, alarm_control_panel.DOMAIN,
|
||||
{'alarm_control_panel': {
|
||||
'platform': 'manual_mqtt',
|
||||
'name': 'test',
|
||||
'pending_time': 10,
|
||||
'armed_home': {
|
||||
'pending_time': 2
|
||||
},
|
||||
'command_topic': 'alarm/command',
|
||||
'state_topic': 'alarm/state',
|
||||
}}))
|
||||
|
||||
entity_id = 'alarm_control_panel.test'
|
||||
|
||||
alarm_control_panel.alarm_arm_home(self.hass)
|
||||
self.hass.block_till_done()
|
||||
|
||||
self.assertEqual(STATE_ALARM_PENDING,
|
||||
self.hass.states.get(entity_id).state)
|
||||
|
||||
future = dt_util.utcnow() + timedelta(seconds=2)
|
||||
with patch(('homeassistant.components.alarm_control_panel.manual_mqtt.'
|
||||
'dt_util.utcnow'), return_value=future):
|
||||
fire_time_changed(self.hass, future)
|
||||
self.hass.block_till_done()
|
||||
|
||||
self.assertEqual(STATE_ALARM_ARMED_HOME,
|
||||
self.hass.states.get(entity_id).state)
|
||||
|
||||
def test_armed_away_with_specific_pending(self):
|
||||
"""Test arm home method."""
|
||||
self.assertTrue(setup_component(
|
||||
self.hass, alarm_control_panel.DOMAIN,
|
||||
{'alarm_control_panel': {
|
||||
'platform': 'manual_mqtt',
|
||||
'name': 'test',
|
||||
'pending_time': 10,
|
||||
'armed_away': {
|
||||
'pending_time': 2
|
||||
},
|
||||
'command_topic': 'alarm/command',
|
||||
'state_topic': 'alarm/state',
|
||||
}}))
|
||||
|
||||
entity_id = 'alarm_control_panel.test'
|
||||
|
||||
alarm_control_panel.alarm_arm_away(self.hass)
|
||||
self.hass.block_till_done()
|
||||
|
||||
self.assertEqual(STATE_ALARM_PENDING,
|
||||
self.hass.states.get(entity_id).state)
|
||||
|
||||
future = dt_util.utcnow() + timedelta(seconds=2)
|
||||
with patch(('homeassistant.components.alarm_control_panel.manual_mqtt.'
|
||||
'dt_util.utcnow'), return_value=future):
|
||||
fire_time_changed(self.hass, future)
|
||||
self.hass.block_till_done()
|
||||
|
||||
self.assertEqual(STATE_ALARM_ARMED_AWAY,
|
||||
self.hass.states.get(entity_id).state)
|
||||
|
||||
def test_armed_night_with_specific_pending(self):
|
||||
"""Test arm home method."""
|
||||
self.assertTrue(setup_component(
|
||||
self.hass, alarm_control_panel.DOMAIN,
|
||||
{'alarm_control_panel': {
|
||||
'platform': 'manual_mqtt',
|
||||
'name': 'test',
|
||||
'pending_time': 10,
|
||||
'armed_night': {
|
||||
'pending_time': 2
|
||||
},
|
||||
'command_topic': 'alarm/command',
|
||||
'state_topic': 'alarm/state',
|
||||
}}))
|
||||
|
||||
entity_id = 'alarm_control_panel.test'
|
||||
|
||||
alarm_control_panel.alarm_arm_night(self.hass)
|
||||
self.hass.block_till_done()
|
||||
|
||||
self.assertEqual(STATE_ALARM_PENDING,
|
||||
self.hass.states.get(entity_id).state)
|
||||
|
||||
future = dt_util.utcnow() + timedelta(seconds=2)
|
||||
with patch(('homeassistant.components.alarm_control_panel.manual_mqtt.'
|
||||
'dt_util.utcnow'), return_value=future):
|
||||
fire_time_changed(self.hass, future)
|
||||
self.hass.block_till_done()
|
||||
|
||||
self.assertEqual(STATE_ALARM_ARMED_NIGHT,
|
||||
self.hass.states.get(entity_id).state)
|
||||
|
||||
def test_trigger_with_specific_pending(self):
|
||||
"""Test arm home method."""
|
||||
self.assertTrue(setup_component(
|
||||
self.hass, alarm_control_panel.DOMAIN,
|
||||
{'alarm_control_panel': {
|
||||
'platform': 'manual_mqtt',
|
||||
'name': 'test',
|
||||
'pending_time': 10,
|
||||
'triggered': {
|
||||
'pending_time': 2
|
||||
},
|
||||
'trigger_time': 3,
|
||||
'disarm_after_trigger': False,
|
||||
'command_topic': 'alarm/command',
|
||||
'state_topic': 'alarm/state',
|
||||
}}))
|
||||
|
||||
entity_id = 'alarm_control_panel.test'
|
||||
|
||||
alarm_control_panel.alarm_arm_home(self.hass)
|
||||
self.hass.block_till_done()
|
||||
|
||||
self.assertEqual(STATE_ALARM_PENDING,
|
||||
self.hass.states.get(entity_id).state)
|
||||
|
||||
future = dt_util.utcnow() + timedelta(seconds=10)
|
||||
with patch(('homeassistant.components.alarm_control_panel.manual_mqtt.'
|
||||
'dt_util.utcnow'), return_value=future):
|
||||
fire_time_changed(self.hass, future)
|
||||
self.hass.block_till_done()
|
||||
|
||||
self.assertEqual(STATE_ALARM_ARMED_HOME,
|
||||
self.hass.states.get(entity_id).state)
|
||||
|
||||
alarm_control_panel.alarm_trigger(self.hass)
|
||||
self.hass.block_till_done()
|
||||
|
||||
self.assertEqual(STATE_ALARM_PENDING,
|
||||
self.hass.states.get(entity_id).state)
|
||||
|
||||
future = dt_util.utcnow() + timedelta(seconds=2)
|
||||
with patch(('homeassistant.components.alarm_control_panel.manual_mqtt.'
|
||||
'dt_util.utcnow'), return_value=future):
|
||||
fire_time_changed(self.hass, future)
|
||||
self.hass.block_till_done()
|
||||
|
||||
self.assertEqual(STATE_ALARM_TRIGGERED,
|
||||
self.hass.states.get(entity_id).state)
|
||||
|
||||
future = dt_util.utcnow() + timedelta(seconds=5)
|
||||
with patch(('homeassistant.components.alarm_control_panel.manual_mqtt.'
|
||||
'dt_util.utcnow'), return_value=future):
|
||||
fire_time_changed(self.hass, future)
|
||||
self.hass.block_till_done()
|
||||
|
||||
self.assertEqual(STATE_ALARM_ARMED_HOME,
|
||||
self.hass.states.get(entity_id).state)
|
||||
|
||||
def test_arm_home_via_command_topic(self):
|
||||
"""Test arming home via command topic."""
|
||||
assert setup_component(self.hass, alarm_control_panel.DOMAIN, {
|
||||
|
|
@ -475,6 +788,40 @@ class TestAlarmControlPanelManualMqtt(unittest.TestCase):
|
|||
self.assertEqual(STATE_ALARM_ARMED_AWAY,
|
||||
self.hass.states.get(entity_id).state)
|
||||
|
||||
def test_arm_night_via_command_topic(self):
|
||||
"""Test arming night via command topic."""
|
||||
assert setup_component(self.hass, alarm_control_panel.DOMAIN, {
|
||||
alarm_control_panel.DOMAIN: {
|
||||
'platform': 'manual_mqtt',
|
||||
'name': 'test',
|
||||
'pending_time': 1,
|
||||
'state_topic': 'alarm/state',
|
||||
'command_topic': 'alarm/command',
|
||||
'payload_arm_night': 'ARM_NIGHT',
|
||||
}
|
||||
})
|
||||
|
||||
entity_id = 'alarm_control_panel.test'
|
||||
|
||||
self.assertEqual(STATE_ALARM_DISARMED,
|
||||
self.hass.states.get(entity_id).state)
|
||||
|
||||
# Fire the arm command via MQTT; ensure state changes to pending
|
||||
fire_mqtt_message(self.hass, 'alarm/command', 'ARM_NIGHT')
|
||||
self.hass.block_till_done()
|
||||
self.assertEqual(STATE_ALARM_PENDING,
|
||||
self.hass.states.get(entity_id).state)
|
||||
|
||||
# Fast-forward a little bit
|
||||
future = dt_util.utcnow() + timedelta(seconds=1)
|
||||
with patch(('homeassistant.components.alarm_control_panel.manual_mqtt.'
|
||||
'dt_util.utcnow'), return_value=future):
|
||||
fire_time_changed(self.hass, future)
|
||||
self.hass.block_till_done()
|
||||
|
||||
self.assertEqual(STATE_ALARM_ARMED_NIGHT,
|
||||
self.hass.states.get(entity_id).state)
|
||||
|
||||
def test_disarm_pending_via_command_topic(self):
|
||||
"""Test disarming pending alarm via command topic."""
|
||||
assert setup_component(self.hass, alarm_control_panel.DOMAIN, {
|
||||
|
|
@ -552,6 +899,20 @@ class TestAlarmControlPanelManualMqtt(unittest.TestCase):
|
|||
self.assertEqual(('alarm/state', STATE_ALARM_ARMED_AWAY, 0, True),
|
||||
self.mock_publish.mock_calls[-2][1])
|
||||
|
||||
# Arm in night mode
|
||||
alarm_control_panel.alarm_arm_night(self.hass)
|
||||
self.hass.block_till_done()
|
||||
self.assertEqual(('alarm/state', STATE_ALARM_PENDING, 0, True),
|
||||
self.mock_publish.mock_calls[-2][1])
|
||||
# Fast-forward a little bit
|
||||
future = dt_util.utcnow() + timedelta(seconds=1)
|
||||
with patch(('homeassistant.components.alarm_control_panel.manual_mqtt.'
|
||||
'dt_util.utcnow'), return_value=future):
|
||||
fire_time_changed(self.hass, future)
|
||||
self.hass.block_till_done()
|
||||
self.assertEqual(('alarm/state', STATE_ALARM_ARMED_NIGHT, 0, True),
|
||||
self.mock_publish.mock_calls[-2][1])
|
||||
|
||||
# Disarm
|
||||
alarm_control_panel.alarm_disarm(self.hass)
|
||||
self.hass.block_till_done()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue