8000 Fixed manual alarm not re-arm after 2nd trigger by snjoetw · Pull Request #9249 · home-assistant/core · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Fixed manual alarm not re-arm after 2nd trigger #9249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 1, 2017
Merged

Fixed manual alarm not re-arm after 2nd trigger #9249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion homeassistant/components/alarm_control_panel/manual.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,9 @@ def state(self):
self._trigger_time) < dt_util.utcnow():
if self._disarm_after_trigger:
return STATE_ALARM_DISARMED
return self._pre_trigger_state
else:
self._state = self._pre_trigger_state
return self._state

return self._state

Expand Down
91 changes: 91 additions & 0 deletions tests/components/alarm_control_panel/test_manual.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,97 @@ def test_trigger_with_disarm_after_trigger(self):
self.assertEqual(STATE_ALARM_DISARMED,
self.hass.states.get(entity_id).state)

def test_trigger_with_no_disarm_after_trigger(self):
"""Test disarm after trigger."""
self.assertTrue(setup_component(
self.hass, alarm_control_panel.DOMAIN,
{'alarm_control_panel': {
'platform': 'manual',
'name': 'test',
'trigger_time': 5,
'pending_time': 0,
'disarm_after_trigger': False
}}))

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.'
'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_back_to_back_trigger_with_no_disarm_after_trigger(self):
"""Test disarm after trigger."""
self.assertTrue(setup_component(
self.hass, alarm_control_panel.DOMAIN,
{'alarm_control_panel': {
'platform': 'manual',
'name': 'test',
'trigger_time': 5,
'pending_time': 0,
'disarm_after_trigger': False
}}))

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.'
'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.'
'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(
Expand Down
0