Homekit component cleanup (#17627)

* hass.async_add_executor_job
* Fix accessories.run -> async_track_state_change
* Fixed media_player test
* Flags are now local vars
* consistent use of " and '
This commit is contained in:
cdce8p authored and GitHub committed 2018-10-20 00:14:05 +02:00
1 parent 3655fefec2
commit a9a8cbbd10
15 files changed
+120 -114

No files matched your search

+2 -2
View File
@@ -4,7 +4,7 @@ from unittest.mock import patch
import pytest
from homeassistant.components.homekit.const import EVENT_HOMEKIT_CHANGED
from homeassistant.core import callback
from homeassistant.core import callback as ha_callback
from pyhap.accessory_driver import AccessoryDriver
@@ -25,5 +25,5 @@ def events(hass):
events = []
hass.bus.async_listen(
EVENT_HOMEKIT_CHANGED,
callback(lambda e: events.append(e)))
ha_callback(lambda e: events.append(e)))
yield events
+4 -5
View File
@@ -80,7 +80,6 @@ async def test_light_basic(hass, hk_driver, cls, events):
async def test_light_brightness(hass, hk_driver, cls, events):
"""Test light with brightness."""
entity_id = 'light.demo'
event_value = "brightness at "
hass.states.async_set(entity_id, STATE_ON, {
ATTR_SUPPORTED_FEATURES: SUPPORT_BRIGHTNESS, ATTR_BRIGHTNESS: 255})
@@ -108,7 +107,7 @@ async def test_light_brightness(hass, hk_driver, cls, events):
assert call_turn_on[0].data[ATTR_ENTITY_ID] == entity_id
assert call_turn_on[0].data[ATTR_BRIGHTNESS_PCT] == 20
assert len(events) == 1
assert events[-1].data[ATTR_VALUE] == "{}20%".format(event_value)
assert events[-1].data[ATTR_VALUE] == 'brightness at 20%'
await hass.async_add_job(acc.char_on.client_update_value, 1)
await hass.async_add_job(acc.char_brightness.client_update_value, 40)
@@ -117,7 +116,7 @@ async def test_light_brightness(hass, hk_driver, cls, events):
assert call_turn_on[1].data[ATTR_ENTITY_ID] == entity_id
assert call_turn_on[1].data[ATTR_BRIGHTNESS_PCT] == 40
assert len(events) == 2
assert events[-1].data[ATTR_VALUE] == "{}40%".format(event_value)
assert events[-1].data[ATTR_VALUE] == 'brightness at 40%'
await hass.async_add_job(acc.char_on.client_update_value, 1)
await hass.async_add_job(acc.char_brightness.client_update_value, 0)
@@ -154,7 +153,7 @@ async def test_light_color_temperature(hass, hk_driver, cls, events):
assert call_turn_on[0].data[ATTR_ENTITY_ID] == entity_id
assert call_turn_on[0].data[ATTR_COLOR_TEMP] == 250
assert len(events) == 1
assert events[-1].data[ATTR_VALUE] == "color temperature at 250"
assert events[-1].data[ATTR_VALUE] == 'color temperature at 250'
async def test_light_rgb_color(hass, hk_driver, cls, events):
@@ -185,4 +184,4 @@ async def test_light_rgb_color(hass, hk_driver, cls, events):
assert call_turn_on[0].data[ATTR_ENTITY_ID] == entity_id
assert call_turn_on[0].data[ATTR_HS_COLOR] == (145, 75)
assert len(events) == 1
assert events[-1].data[ATTR_VALUE] == "set color at (145, 75)"
assert events[-1].data[ATTR_VALUE] == 'set color at (145, 75)'
@@ -29,32 +29,32 @@ async def test_media_player_set_state(hass, hk_driver, events):
assert acc.aid == 2
assert acc.category == 8 # Switch
assert acc.chars[FEATURE_ON_OFF].value == 0
assert acc.chars[FEATURE_PLAY_PAUSE].value == 0
assert acc.chars[FEATURE_PLAY_STOP].value == 0
assert acc.chars[FEATURE_TOGGLE_MUTE].value == 0
assert acc.chars[FEATURE_ON_OFF].value is False
assert acc.chars[FEATURE_PLAY_PAUSE].value is False
assert acc.chars[FEATURE_PLAY_STOP].value is False
assert acc.chars[FEATURE_TOGGLE_MUTE].value is False
hass.states.async_set(entity_id, STATE_ON, {ATTR_MEDIA_VOLUME_MUTED: True})
await hass.async_block_till_done()
assert acc.chars[FEATURE_ON_OFF].value == 1
assert acc.chars[FEATURE_TOGGLE_MUTE].value == 1
assert acc.chars[FEATURE_ON_OFF].value is True
assert acc.chars[FEATURE_TOGGLE_MUTE].value is True
hass.states.async_set(entity_id, STATE_OFF)
await hass.async_block_till_done()
assert acc.chars[FEATURE_ON_OFF].value == 0
assert acc.chars[FEATURE_ON_OFF].value is False
hass.states.async_set(entity_id, STATE_PLAYING)
await hass.async_block_till_done()
assert acc.chars[FEATURE_PLAY_PAUSE].value == 1
assert acc.chars[FEATURE_PLAY_STOP].value == 1
assert acc.chars[FEATURE_PLAY_PAUSE].value is True
assert acc.chars[FEATURE_PLAY_STOP].value is True
hass.states.async_set(entity_id, STATE_PAUSED)
await hass.async_block_till_done()
assert acc.chars[FEATURE_PLAY_PAUSE].value == 0
assert acc.chars[FEATURE_PLAY_PAUSE].value is False
hass.states.async_set(entity_id, STATE_IDLE)
await hass.async_block_till_done()
assert acc.chars[FEATURE_PLAY_STOP].value == 0
assert acc.chars[FEATURE_PLAY_STOP].value is False
# Set from HomeKit
call_turn_on = async_mock_service(hass, DOMAIN, 'turn_on')
@@ -163,7 +163,7 @@ async def test_thermostat(hass, hk_driver, cls, events):
assert call_set_temperature[0].data[ATTR_TEMPERATURE] == 19.0
assert acc.char_target_temp.value == 19.0
assert len(events) == 1
assert events[-1].data[ATTR_VALUE] == 'target 19.0°C'
assert events[-1].data[ATTR_VALUE] == '19.0°C'
await hass.async_add_job(acc.char_target_heat_cool.client_update_value, 1)
await hass.async_block_till_done()
@@ -379,7 +379,7 @@ async def test_thermostat_fahrenheit(hass, hk_driver, cls, events):
assert call_set_temperature[2].data[ATTR_ENTITY_ID] == entity_id
assert call_set_temperature[2].data[ATTR_TEMPERATURE] == 75.2
assert len(events) == 3
assert events[-1].data[ATTR_VALUE] == 'target 75.2°F'
assert events[-1].data[ATTR_VALUE] == '75.2°F'
async def test_thermostat_get_temperature_range(hass, hk_driver, cls):
@@ -453,7 +453,7 @@ async def test_water_heater(hass, hk_driver, cls, events):
assert call_set_temperature[0].data[ATTR_TEMPERATURE] == 52.0
assert acc.char_target_temp.value == 52.0
assert len(events) == 1
assert events[-1].data[ATTR_VALUE] == 'target 52.0°C'
assert events[-1].data[ATTR_VALUE] == '52.0°C'
await hass.async_add_job(acc.char_target_heat_cool.client_update_value, 0)
await hass.async_block_till_done()
@@ -499,7 +499,7 @@ async def test_water_heater_fahrenheit(hass, hk_driver, cls, events):
assert call_set_temperature[0].data[ATTR_TEMPERATURE] == 140.0
assert acc.char_target_temp.value == 60.0
assert len(events) == 1
assert events[-1].data[ATTR_VALUE] == 'target 140.0°F'
assert events[-1].data[ATTR_VALUE] == '140.0°F'
async def test_water_heater_get_temperature_range(hass, hk_driver, cls):