Log error for servicecall without required data
* Log error for services called without required attributes, in media_player, notify and thermostat platforms. * Add fan property and methods in thermostat demo component. * Add tests for notify file and thermostat demo component. * Increase coverage of tests for media_player, notify and thermostat platforms. * Fix some PEP issues, but not all. Tests still have old linting errors.
This commit is contained in:
1 parent
72fdd94b29
commit
4e4b24fcff
14 files changed
+489
-90
No files matched your search
@@ -19,6 +19,8 @@ from homeassistant.const import (
|
||||
SERVICE_MEDIA_PLAY_PAUSE, SERVICE_MEDIA_PLAY, SERVICE_MEDIA_PAUSE,
|
||||
SERVICE_MEDIA_NEXT_TRACK, SERVICE_MEDIA_PREVIOUS_TRACK, SERVICE_MEDIA_SEEK)
|
||||
|
||||
_LOGGER = logging.getLogger(__name__)
|
||||
|
||||
DOMAIN = 'media_player'
|
||||
SCAN_INTERVAL = 10
|
||||
|
||||
@@ -230,11 +232,9 @@ def setup(hass, config):
|
||||
|
||||
def media_player_service_handler(service):
|
||||
"""Map services to methods on MediaPlayerDevice."""
|
||||
target_players = component.extract_from_service(service)
|
||||
|
||||
method = SERVICE_TO_METHOD[service.service]
|
||||
|
||||
for player in target_players:
|
||||
for player in component.extract_from_service(service):
|
||||
getattr(player, method)()
|
||||
|
||||
if player.should_poll:
|
||||
@@ -246,14 +246,15 @@ def setup(hass, config):
|
||||
|
||||
def volume_set_service(service):
|
||||
"""Set specified volume on the media player."""
|
||||
target_players = component.extract_from_service(service)
|
||||
volume = service.data.get(ATTR_MEDIA_VOLUME_LEVEL)
|
||||
|
||||
if ATTR_MEDIA_VOLUME_LEVEL not in service.data:
|
||||
if volume is None:
|
||||
_LOGGER.error(
|
||||
'Received call to %s without attribute %s',
|
||||
service.service, ATTR_MEDIA_VOLUME_LEVEL)
|
||||
return
|
||||
|
||||
volume = service.data[ATTR_MEDIA_VOLUME_LEVEL]
|
||||
|
||||
for player in target_players:
|
||||
for player in component.extract_from_service(service):
|
||||
player.set_volume_level(volume)
|
||||
|
||||
if player.should_poll:
|
||||
@@ -264,14 +265,15 @@ def setup(hass, config):
|
||||
|
||||
def volume_mute_service(service):
|
||||
"""Mute (true) or unmute (false) the media player."""
|
||||
target_players = component.extract_from_service(service)
|
||||
mute = service.data.get(ATTR_MEDIA_VOLUME_MUTED)
|
||||
|
||||
if ATTR_MEDIA_VOLUME_MUTED not in service.data:
|
||||
if mute is None:
|
||||
_LOGGER.error(
|
||||
'Received call to %s without attribute %s',
|
||||
service.service, ATTR_MEDIA_VOLUME_MUTED)
|
||||
return
|
||||
|
||||
mute = service.data[ATTR_MEDIA_VOLUME_MUTED]
|
||||
|
||||
for player in target_players:
|
||||
for player in component.extract_from_service(service):
|
||||
player.mute_volume(mute)
|
||||
|
||||
if player.should_poll:
|
||||
@@ -282,14 +284,15 @@ def setup(hass, config):
|
||||
|
||||
def media_seek_service(service):
|
||||
"""Seek to a position."""
|
||||
target_players = component.extract_from_service(service)
|
||||
position = service.data.get(ATTR_MEDIA_SEEK_POSITION)
|
||||
|
||||
if ATTR_MEDIA_SEEK_POSITION not in service.data:
|
||||
if position is None:
|
||||
_LOGGER.error(
|
||||
'Received call to %s without attribute %s',
|
||||
service.service, ATTR_MEDIA_SEEK_POSITION)
|
||||
return
|
||||
|
||||
position = service.data[ATTR_MEDIA_SEEK_POSITION]
|
||||
|
||||
for player in target_players:
|
||||
for player in component.extract_from_service(service):
|
||||
player.media_seek(position)
|
||||
|
||||
if player.should_poll:
|
||||
@@ -303,10 +306,12 @@ def setup(hass, config):
|
||||
media_type = service.data.get(ATTR_MEDIA_CONTENT_TYPE)
|
||||
media_id = service.data.get(ATTR_MEDIA_CONTENT_ID)
|
||||
|
||||
if media_type is None:
|
||||
return
|
||||
|
||||
if media_id is None:
|
||||
if media_type is None or media_id is None:
|
||||
missing_attr = (ATTR_MEDIA_CONTENT_TYPE if media_type is None
|
||||
else ATTR_MEDIA_CONTENT_ID)
|
||||
_LOGGER.error(
|
||||
'Received call to %s without attribute %s',
|
||||
service.service, missing_attr)
|
||||
return
|
||||
|
||||
for player in component.extract_from_service(service):
|
||||
|
||||
@@ -239,7 +239,7 @@ class DemoMusicPlayer(AbstractDemoPlayer):
|
||||
if self._cur_track > 0:
|
||||
support |= SUPPORT_PREVIOUS_TRACK
|
||||
|
||||
if self._cur_track < len(self.tracks)-1:
|
||||
if self._cur_track < len(self.tracks) - 1:
|
||||
support |= SUPPORT_NEXT_TRACK
|
||||
|
||||
return support
|
||||
@@ -252,7 +252,7 @@ class DemoMusicPlayer(AbstractDemoPlayer):
|
||||
|
||||
def media_next_track(self):
|
||||
"""Send next track command."""
|
||||
if self._cur_track < len(self.tracks)-1:
|
||||
if self._cur_track < len(self.tracks) - 1:
|
||||
self._cur_track += 1
|
||||
self.update_ha_state()
|
||||
|
||||
|
||||
@@ -71,6 +71,9 @@ def setup(hass, config):
|
||||
message = call.data.get(ATTR_MESSAGE)
|
||||
|
||||
if message is None:
|
||||
_LOGGER.error(
|
||||
'Received call to %s without attribute %s',
|
||||
call.service, ATTR_MESSAGE)
|
||||
return
|
||||
|
||||
title = template.render(
|
||||
|
||||
@@ -45,7 +45,7 @@ class FileNotificationService(BaseNotificationService):
|
||||
title = '{} notifications (Log started: {})\n{}\n'.format(
|
||||
kwargs.get(ATTR_TITLE),
|
||||
dt_util.strip_microseconds(dt_util.utcnow()),
|
||||
'-'*80)
|
||||
'-' * 80)
|
||||
file.write(title)
|
||||
|
||||
if self.add_timestamp == 1:
|
||||
|
||||
@@ -123,6 +123,9 @@ def setup(hass, config):
|
||||
service.data.get(ATTR_TEMPERATURE), float)
|
||||
|
||||
if temperature is None:
|
||||
_LOGGER.error(
|
||||
"Received call to %s without attribute %s",
|
||||
SERVICE_SET_TEMPERATURE, ATTR_TEMPERATURE)
|
||||
return
|
||||
|
||||
for thermostat in target_thermostats:
|
||||
|
||||
@@ -11,8 +11,8 @@ from homeassistant.const import TEMP_CELCIUS, TEMP_FAHRENHEIT
|
||||
def setup_platform(hass, config, add_devices, discovery_info=None):
|
||||
"""Setup the Demo thermostats."""
|
||||
add_devices([
|
||||
DemoThermostat("Nest", 21, TEMP_CELCIUS, False, 19),
|
||||
DemoThermostat("Thermostat", 68, TEMP_FAHRENHEIT, True, 77),
|
||||
DemoThermostat("Nest", 21, TEMP_CELCIUS, False, 19, False),
|
||||
DemoThermostat("Thermostat", 68, TEMP_FAHRENHEIT, True, 77, True),
|
||||
])
|
||||
|
||||
|
||||
@@ -21,13 +21,14 @@ class DemoThermostat(ThermostatDevice):
|
||||
"""Representation of a demo thermostat."""
|
||||
|
||||
def __init__(self, name, target_temperature, unit_of_measurement,
|
||||
away, current_temperature):
|
||||
away, current_temperature, is_fan_on):
|
||||
"""Initialize the thermostat."""
|
||||
self._name = name
|
||||
self._target_temperature = target_temperature
|
||||
self._unit_of_measurement = unit_of_measurement
|
||||
self._away = away
|
||||
self._current_temperature = current_temperature
|
||||
self._is_fan_on = is_fan_on
|
||||
|
||||
@property
|
||||
def should_poll(self):
|
||||
@@ -59,6 +60,11 @@ class DemoThermostat(ThermostatDevice):
|
||||
"""Return if away mode is on."""
|
||||
return self._away
|
||||
|
||||
@property
|
||||
def is_fan_on(self):
|
||||
"""Return true if the fan is on."""
|
||||
return self._is_fan_on
|
||||
|
||||
def set_temperature(self, temperature):
|
||||
"""Set new target temperature."""
|
||||
self._target_temperature = temperature
|
||||
@@ -70,3 +76,11 @@ class DemoThermostat(ThermostatDevice):
|
||||
def turn_away_mode_off(self):
|
||||
"""Turn away mode off."""
|
||||
self._away = False
|
||||
|
||||
def turn_fan_on(self):
|
||||
"""Turn fan on."""
|
||||
self._is_fan_on = True
|
||||
|
||||
def turn_fan_off(self):
|
||||
"""Turn fan off."""
|
||||
self._is_fan_on = False
|
||||
Reference in new issue
Block a user