evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix low_battery_threshold issue HomeKit (#23593)

Browse source
This commit is contained in:
cdce8p 2019-05-01 16:48:56 +02:00 • committed by GitHub
parent d3cbd5b5e4
commit db2904624a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
homeassistant/components/homekit/accessories.py
View file

@ -20,7 +20,8 @@ from .const import (
ATTR_DISPLAY_NAME, ATTR_VALUE, BRIDGE_MODEL, BRIDGE_SERIAL_NUMBER,
CHAR_BATTERY_LEVEL, CHAR_CHARGING_STATE, CHAR_STATUS_LOW_BATTERY,
CONF_LINKED_BATTERY_SENSOR, CONF_LOW_BATTERY_THRESHOLD, DEBOUNCE_TIMEOUT,
EVENT_HOMEKIT_CHANGED, MANUFACTURER, SERV_BATTERY_SERVICE)
DEFAULT_LOW_BATTERY_THRESHOLD, EVENT_HOMEKIT_CHANGED, MANUFACTURER,
SERV_BATTERY_SERVICE)
from .util import convert_to_float, dismiss_setup_message, show_setup_message
_LOGGER = logging.getLogger(__name__)
@ -74,7 +75,8 @@ class HomeAccessory(Accessory):
self.linked_battery_sensor = \
self.config.get(CONF_LINKED_BATTERY_SENSOR)
self.low_battery_threshold = \
self.config.get(CONF_LOW_BATTERY_THRESHOLD)
self.config.get(CONF_LOW_BATTERY_THRESHOLD,
DEFAULT_LOW_BATTERY_THRESHOLD)
"""Add battery service if available"""
battery_found = self.hass.states.get(self.entity_id).attributes \

14
tests/components/homekit/test_accessories.py
View file

@ -14,7 +14,7 @@ from homeassistant.components.homekit.const import (
BRIDGE_MODEL, BRIDGE_NAME, BRIDGE_SERIAL_NUMBER, CHAR_FIRMWARE_REVISION,
CHAR_MANUFACTURER, CHAR_MODEL, CHAR_NAME, CHAR_SERIAL_NUMBER,
CONF_LINKED_BATTERY_SENSOR, CONF_LOW_BATTERY_THRESHOLD,
DEFAULT_LOW_BATTERY_THRESHOLD, MANUFACTURER, SERV_ACCESSORY_INFO)
MANUFACTURER, SERV_ACCESSORY_INFO)
from homeassistant.const import (
__version__, ATTR_BATTERY_CHARGING, ATTR_BATTERY_LEVEL, ATTR_ENTITY_ID,
ATTR_SERVICE, ATTR_NOW, EVENT_TIME_CHANGED)
@ -107,9 +107,7 @@ async def test_battery_service(hass, hk_driver, caplog):
hass.states.async_set(entity_id, None, {ATTR_BATTERY_LEVEL: 50})
await hass.async_block_till_done()
acc = HomeAccessory(hass, hk_driver, 'Battery Service', entity_id, 2,
{CONF_LOW_BATTERY_THRESHOLD:
DEFAULT_LOW_BATTERY_THRESHOLD})
acc = HomeAccessory(hass, hk_driver, 'Battery Service', entity_id, 2, None)
acc.update_state = lambda x: None
assert acc._char_battery.value == 0
assert acc._char_low_battery.value == 0
@ -139,9 +137,7 @@ async def test_battery_service(hass, hk_driver, caplog):
ATTR_BATTERY_LEVEL: 10, ATTR_BATTERY_CHARGING: True})
await hass.async_block_till_done()
acc = HomeAccessory(hass, hk_driver, 'Battery Service', entity_id, 2,
{CONF_LOW_BATTERY_THRESHOLD:
DEFAULT_LOW_BATTERY_THRESHOLD})
acc = HomeAccessory(hass, hk_driver, 'Battery Service', entity_id, 2, None)
acc.update_state = lambda x: None
assert acc._char_battery.value == 0
assert acc._char_low_battery.value == 0
@ -170,9 +166,7 @@ async def test_linked_battery_sensor(hass, hk_driver, caplog):
await hass.async_block_till_done()
acc = HomeAccessory(hass, hk_driver, 'Battery Service', entity_id, 2,
{CONF_LINKED_BATTERY_SENSOR: linked_battery,
CONF_LOW_BATTERY_THRESHOLD:
DEFAULT_LOW_BATTERY_THRESHOLD})
{CONF_LINKED_BATTERY_SENSOR: linked_battery})
acc.update_state = lambda x: None
assert acc.linked_battery_sensor == linked_battery