jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-22 20:57:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure HomeKit does not throw when a linked motion sensor is removed (#37773)

Browse Source
This commit is contained in:
J. Nick Koston 2020-07-14 10:38:55 -10:00 committed by GitHub
parent f8d547f2d3
commit d4111617ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
homeassistant/components/homekit/type_cameras.py
View File

@ -16,7 +16,7 @@ from homeassistant.components.ffmpeg import DATA_FFMPEG
from homeassistant.const import STATE_ON from homeassistant.const import STATE_ON
from homeassistant.core import callback from homeassistant.core import callback
from homeassistant.helpers.event import ( from homeassistant.helpers.event import (
async_track_state_change, async_track_state_change_event,
async_track_time_interval, async_track_time_interval,
) )
from homeassistant.util import get_local_ip from homeassistant.util import get_local_ip
@ -201,7 +201,7 @@ class Camera(HomeAccessory, PyhapCamera):
self._char_motion_detected = serv_motion.configure_char( self._char_motion_detected = serv_motion.configure_char(
CHAR_MOTION_DETECTED, value=False CHAR_MOTION_DETECTED, value=False
) )
self._async_update_motion_state(None, None, state) self._async_update_motion_state(state)
async def run_handler(self): async def run_handler(self):
"""Handle accessory driver started event. """Handle accessory driver started event.
@ -209,17 +209,25 @@ class Camera(HomeAccessory, PyhapCamera):
Run inside the Home Assistant event loop. Run inside the Home Assistant event loop.
""" """
if self._char_motion_detected: if self._char_motion_detected:
async_track_state_change( async_track_state_change_event(
self.hass, self.linked_motion_sensor, self._async_update_motion_state self.hass,
[self.linked_motion_sensor],
self._async_update_motion_state_event,
) )
await super().run_handler() await super().run_handler()
@callback @callback
def _async_update_motion_state( def _async_update_motion_state_event(self, event):
self, entity_id=None, old_state=None, new_state=None """Handle state change event listener callback."""
): self._async_update_motion_state(event.data.get("new_state"))
@callback
def _async_update_motion_state(self, new_state):
"""Handle link motion sensor state change to update HomeKit value.""" """Handle link motion sensor state change to update HomeKit value."""
if not new_state:
return
detected = new_state.state == STATE_ON detected = new_state.state == STATE_ON
if self._char_motion_detected.value == detected: if self._char_motion_detected.value == detected:
return return

8
tests/components/homekit/test_type_cameras.py
View File

@ -564,6 +564,14 @@ async def test_camera_with_linked_motion_sensor(hass, run_driver, events):
await hass.async_block_till_done() await hass.async_block_till_done()
assert char.value is True assert char.value is True
# Ensure we do not throw when the linked
# motion sensor is removed
hass.states.async_remove(motion_entity_id)
await hass.async_block_till_done()
await acc.run_handler()
await hass.async_block_till_done()
assert char.value is True
async def test_camera_with_a_missing_linked_motion_sensor(hass, run_driver, events): async def test_camera_with_a_missing_linked_motion_sensor(hass, run_driver, events):
"""Test a camera with a configured linked motion sensor that is missing.""" """Test a camera with a configured linked motion sensor that is missing."""