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
@@ -25,6 +25,11 @@ class TestDemoMediaPlayer(unittest.TestCase):
|
||||
state = self.hass.states.get(entity_id)
|
||||
assert 1.0 == state.attributes.get('volume_level')
|
||||
|
||||
mp.set_volume_level(self.hass, None, entity_id)
|
||||
self.hass.pool.block_till_done()
|
||||
state = self.hass.states.get(entity_id)
|
||||
assert 1.0 == state.attributes.get('volume_level')
|
||||
|
||||
mp.set_volume_level(self.hass, 0.5, entity_id)
|
||||
self.hass.pool.block_till_done()
|
||||
state = self.hass.states.get(entity_id)
|
||||
@@ -41,6 +46,12 @@ class TestDemoMediaPlayer(unittest.TestCase):
|
||||
assert 0.5 == state.attributes.get('volume_level')
|
||||
|
||||
assert False is state.attributes.get('is_volume_muted')
|
||||
|
||||
mp.mute_volume(self.hass, None, entity_id)
|
||||
self.hass.pool.block_till_done()
|
||||
state = self.hass.states.get(entity_id)
|
||||
assert False is state.attributes.get('is_volume_muted')
|
||||
|
||||
mp.mute_volume(self.hass, True, entity_id)
|
||||
self.hass.pool.block_till_done()
|
||||
state = self.hass.states.get(entity_id)
|
||||
@@ -87,7 +98,7 @@ class TestDemoMediaPlayer(unittest.TestCase):
|
||||
assert self.hass.states.is_state(entity_id, 'playing')
|
||||
|
||||
def test_prev_next_track(self):
|
||||
"""Test media_next_track and media_prevoius_track ."""
|
||||
"""Test media_next_track and media_previous_track ."""
|
||||
assert mp.setup(self.hass, {'media_player': {'platform': 'demo'}})
|
||||
state = self.hass.states.get(entity_id)
|
||||
assert 1 == state.attributes.get('media_track')
|
||||
@@ -115,6 +126,27 @@ class TestDemoMediaPlayer(unittest.TestCase):
|
||||
assert 0 < (mp.SUPPORT_PREVIOUS_TRACK &
|
||||
state.attributes.get('supported_media_commands'))
|
||||
|
||||
assert mp.setup(self.hass, {'media_player': {'platform': 'demo'}})
|
||||
ent_id = 'media_player.lounge_room'
|
||||
state = self.hass.states.get(ent_id)
|
||||
assert 1 == state.attributes.get('media_episode')
|
||||
assert 0 == (mp.SUPPORT_PREVIOUS_TRACK &
|
||||
state.attributes.get('supported_media_commands'))
|
||||
|
||||
mp.media_next_track(self.hass, ent_id)
|
||||
self.hass.pool.block_till_done()
|
||||
state = self.hass.states.get(ent_id)
|
||||
assert 2 == state.attributes.get('media_episode')
|
||||
assert 0 < (mp.SUPPORT_PREVIOUS_TRACK &
|
||||
state.attributes.get('supported_media_commands'))
|
||||
|
||||
mp.media_previous_track(self.hass, ent_id)
|
||||
self.hass.pool.block_till_done()
|
||||
state = self.hass.states.get(ent_id)
|
||||
assert 1 == state.attributes.get('media_episode')
|
||||
assert 0 == (mp.SUPPORT_PREVIOUS_TRACK &
|
||||
state.attributes.get('supported_media_commands'))
|
||||
|
||||
@patch('homeassistant.components.media_player.demo.DemoYoutubePlayer.'
|
||||
'media_seek')
|
||||
def test_play_media(self, mock_seek):
|
||||
@@ -126,6 +158,13 @@ class TestDemoMediaPlayer(unittest.TestCase):
|
||||
state.attributes.get('supported_media_commands'))
|
||||
assert state.attributes.get('media_content_id') is not None
|
||||
|
||||
mp.play_media(self.hass, None, 'some_id', ent_id)
|
||||
self.hass.pool.block_till_done()
|
||||
state = self.hass.states.get(ent_id)
|
||||
assert 0 < (mp.SUPPORT_PLAY_MEDIA &
|
||||
state.attributes.get('supported_media_commands'))
|
||||
assert not 'some_id' == state.attributes.get('media_content_id')
|
||||
|
||||
mp.play_media(self.hass, 'youtube', 'some_id', ent_id)
|
||||
self.hass.pool.block_till_done()
|
||||
state = self.hass.states.get(ent_id)
|
||||
@@ -133,6 +172,9 @@ class TestDemoMediaPlayer(unittest.TestCase):
|
||||
state.attributes.get('supported_media_commands'))
|
||||
assert 'some_id' == state.attributes.get('media_content_id')
|
||||
|
||||
assert not mock_seek.called
|
||||
mp.media_seek(self.hass, None, ent_id)
|
||||
self.hass.pool.block_till_done()
|
||||
assert not mock_seek.called
|
||||
mp.media_seek(self.hass, 100, ent_id)
|
||||
self.hass.pool.block_till_done()
|
||||
|
||||
@@ -25,8 +25,37 @@ class MockMediaPlayer(media_player.MediaPlayerDevice):
|
||||
self._media_title = None
|
||||
self._supported_media_commands = 0
|
||||
|
||||
self.turn_off_service_calls = mock_service(
|
||||
hass, media_player.DOMAIN, media_player.SERVICE_TURN_OFF)
|
||||
self.service_calls = {
|
||||
'turn_on': mock_service(
|
||||
hass, media_player.DOMAIN, media_player.SERVICE_TURN_ON),
|
||||
'turn_off': mock_service(
|
||||
hass, media_player.DOMAIN, media_player.SERVICE_TURN_OFF),
|
||||
'mute_volume': mock_service(
|
||||
hass, media_player.DOMAIN, media_player.SERVICE_VOLUME_MUTE),
|
||||
'set_volume_level': mock_service(
|
||||
hass, media_player.DOMAIN, media_player.SERVICE_VOLUME_SET),
|
||||
'media_play': mock_service(
|
||||
hass, media_player.DOMAIN, media_player.SERVICE_MEDIA_PLAY),
|
||||
'media_pause': mock_service(
|
||||
hass, media_player.DOMAIN, media_player.SERVICE_MEDIA_PAUSE),
|
||||
'media_previous_track': mock_service(
|
||||
hass, media_player.DOMAIN,
|
||||
media_player.SERVICE_MEDIA_PREVIOUS_TRACK),
|
||||
'media_next_track': mock_service(
|
||||
hass, media_player.DOMAIN,
|
||||
media_player.SERVICE_MEDIA_NEXT_TRACK),
|
||||
'media_seek': mock_service(
|
||||
hass, media_player.DOMAIN, media_player.SERVICE_MEDIA_SEEK),
|
||||
'play_media': mock_service(
|
||||
hass, media_player.DOMAIN, media_player.SERVICE_PLAY_MEDIA),
|
||||
'volume_up': mock_service(
|
||||
hass, media_player.DOMAIN, media_player.SERVICE_VOLUME_UP),
|
||||
'volume_down': mock_service(
|
||||
hass, media_player.DOMAIN, media_player.SERVICE_VOLUME_DOWN),
|
||||
'media_play_pause': mock_service(
|
||||
hass, media_player.DOMAIN,
|
||||
media_player.SERVICE_MEDIA_PLAY_PAUSE),
|
||||
}
|
||||
|
||||
@property
|
||||
def name(self):
|
||||
@@ -97,23 +126,26 @@ class TestMediaPlayer(unittest.TestCase):
|
||||
self.mock_state_switch_id = switch.ENTITY_ID_FORMAT.format('state')
|
||||
self.hass.states.set(self.mock_state_switch_id, STATE_OFF)
|
||||
|
||||
self.config_children_only = \
|
||||
{'name': 'test', 'platform': 'universal',
|
||||
'children': [media_player.ENTITY_ID_FORMAT.format('mock1'),
|
||||
media_player.ENTITY_ID_FORMAT.format('mock2')]}
|
||||
self.config_children_and_attr = \
|
||||
{'name': 'test', 'platform': 'universal',
|
||||
'children': [media_player.ENTITY_ID_FORMAT.format('mock1'),
|
||||
media_player.ENTITY_ID_FORMAT.format('mock2')],
|
||||
'attributes': {
|
||||
'is_volume_muted': self.mock_mute_switch_id,
|
||||
'state': self.mock_state_switch_id}}
|
||||
self.config_children_only = {
|
||||
'name': 'test', 'platform': 'universal',
|
||||
'children': [media_player.ENTITY_ID_FORMAT.format('mock1'),
|
||||
media_player.ENTITY_ID_FORMAT.format('mock2')]
|
||||
}
|
||||
self.config_children_and_attr = {
|
||||
'name': 'test', 'platform': 'universal',
|
||||
'children': [media_player.ENTITY_ID_FORMAT.format('mock1'),
|
||||
media_player.ENTITY_ID_FORMAT.format('mock2')],
|
||||
'attributes': {
|
||||
'is_volume_muted': self.mock_mute_switch_id,
|
||||
'state': self.mock_state_switch_id
|
||||
}
|
||||
}
|
||||
|
||||
def tearDown(self): # pylint: disable=invalid-name
|
||||
"""Stop everything that was started."""
|
||||
self.hass.stop()
|
||||
|
||||
def test_check_config_children_only(self):
|
||||
def test_config_children_only(self):
|
||||
"""Check config with only children."""
|
||||
config_start = copy(self.config_children_only)
|
||||
del config_start['platform']
|
||||
@@ -125,7 +157,7 @@ class TestMediaPlayer(unittest.TestCase):
|
||||
self.assertTrue(response)
|
||||
self.assertEqual(config_start, self.config_children_only)
|
||||
|
||||
def test_check_config_children_and_attr(self):
|
||||
def test_config_children_and_attr(self):
|
||||
"""Check config with children and attributes."""
|
||||
config_start = copy(self.config_children_and_attr)
|
||||
del config_start['platform']
|
||||
@@ -136,13 +168,13 @@ class TestMediaPlayer(unittest.TestCase):
|
||||
self.assertTrue(response)
|
||||
self.assertEqual(config_start, self.config_children_and_attr)
|
||||
|
||||
def test_check_config_no_name(self):
|
||||
def test_config_no_name(self):
|
||||
"""Check config with no Name entry."""
|
||||
response = universal.validate_config({'platform': 'universal'})
|
||||
|
||||
self.assertFalse(response)
|
||||
|
||||
def test_check_config_bad_children(self):
|
||||
def test_config_bad_children(self):
|
||||
"""Check config with bad children entry."""
|
||||
config_no_children = {'name': 'test', 'platform': 'universal'}
|
||||
config_bad_children = {'name': 'test', 'children': {},
|
||||
@@ -156,7 +188,7 @@ class TestMediaPlayer(unittest.TestCase):
|
||||
self.assertTrue(response)
|
||||
self.assertEqual([], config_bad_children['children'])
|
||||
|
||||
def test_check_config_bad_commands(self):
|
||||
def test_config_bad_commands(self):
|
||||
"""Check config with bad commands entry."""
|
||||
config = {'name': 'test', 'commands': [], 'platform': 'universal'}
|
||||
|
||||
@@ -164,7 +196,7 @@ class TestMediaPlayer(unittest.TestCase):
|
||||
self.assertTrue(response)
|
||||
self.assertEqual({}, config['commands'])
|
||||
|
||||
def test_check_config_bad_attributes(self):
|
||||
def test_config_bad_attributes(self):
|
||||
"""Check config with bad attributes."""
|
||||
config = {'name': 'test', 'attributes': [], 'platform': 'universal'}
|
||||
|
||||
@@ -172,7 +204,7 @@ class TestMediaPlayer(unittest.TestCase):
|
||||
self.assertTrue(response)
|
||||
self.assertEqual({}, config['attributes'])
|
||||
|
||||
def test_check_config_bad_key(self):
|
||||
def test_config_bad_key(self):
|
||||
"""Check config with bad key."""
|
||||
config = {'name': 'test', 'asdf': 5, 'platform': 'universal'}
|
||||
|
||||
@@ -183,6 +215,7 @@ class TestMediaPlayer(unittest.TestCase):
|
||||
def test_platform_setup(self):
|
||||
"""Test platform setup."""
|
||||
config = {'name': 'test', 'platform': 'universal'}
|
||||
bad_config = {'platform': 'universal'}
|
||||
entities = []
|
||||
|
||||
def add_devices(new_entities):
|
||||
@@ -190,8 +223,10 @@ class TestMediaPlayer(unittest.TestCase):
|
||||
for dev in new_entities:
|
||||
entities.append(dev)
|
||||
|
||||
universal.setup_platform(self.hass, config, add_devices)
|
||||
universal.setup_platform(self.hass, bad_config, add_devices)
|
||||
self.assertEqual(0, len(entities))
|
||||
|
||||
universal.setup_platform(self.hass, config, add_devices)
|
||||
self.assertEqual(1, len(entities))
|
||||
self.assertEqual('test', entities[0].name)
|
||||
|
||||
@@ -263,6 +298,15 @@ class TestMediaPlayer(unittest.TestCase):
|
||||
|
||||
self.assertEqual(config['name'], ump.name)
|
||||
|
||||
def test_polling(self):
|
||||
"""Test should_poll property."""
|
||||
config = self.config_children_only
|
||||
universal.validate_config(config)
|
||||
|
||||
ump = universal.UniversalMediaPlayer(self.hass, **config)
|
||||
|
||||
self.assertEqual(False, ump.should_poll)
|
||||
|
||||
def test_state_children_only(self):
|
||||
"""Test media player state with only children."""
|
||||
config = self.config_children_only
|
||||
@@ -388,8 +432,7 @@ class TestMediaPlayer(unittest.TestCase):
|
||||
ump.entity_id = media_player.ENTITY_ID_FORMAT.format(config['name'])
|
||||
ump.update()
|
||||
|
||||
self.mock_mp_1._supported_media_commands = \
|
||||
universal.SUPPORT_VOLUME_SET
|
||||
self.mock_mp_1._supported_media_commands = universal.SUPPORT_VOLUME_SET
|
||||
self.mock_mp_1._state = STATE_PLAYING
|
||||
self.mock_mp_1.update_ha_state()
|
||||
ump.update()
|
||||
@@ -400,7 +443,7 @@ class TestMediaPlayer(unittest.TestCase):
|
||||
self.assertEqual(check_flags, ump.supported_media_commands)
|
||||
|
||||
def test_service_call_to_child(self):
|
||||
"""Test a service call that should be routed to a child."""
|
||||
"""Test service calls that should be routed to a child."""
|
||||
config = self.config_children_only
|
||||
universal.validate_config(config)
|
||||
|
||||
@@ -413,13 +456,53 @@ class TestMediaPlayer(unittest.TestCase):
|
||||
ump.update()
|
||||
|
||||
ump.turn_off()
|
||||
self.assertEqual(1, len(self.mock_mp_2.turn_off_service_calls))
|
||||
self.assertEqual(1, len(self.mock_mp_2.service_calls['turn_off']))
|
||||
|
||||
ump.turn_on()
|
||||
self.assertEqual(1, len(self.mock_mp_2.service_calls['turn_on']))
|
||||
|
||||
ump.mute_volume(True)
|
||||
self.assertEqual(1, len(self.mock_mp_2.service_calls['mute_volume']))
|
||||
|
||||
ump.set_volume_level(0.5)
|
||||
self.assertEqual(
|
||||
1, len(self.mock_mp_2.service_calls['set_volume_level']))
|
||||
|
||||
ump.media_play()
|
||||
self.assertEqual(1, len(self.mock_mp_2.service_calls['media_play']))
|
||||
|
||||
ump.media_pause()
|
||||
self.assertEqual(1, len(self.mock_mp_2.service_calls['media_pause']))
|
||||
|
||||
ump.media_previous_track()
|
||||
self.assertEqual(
|
||||
1, len(self.mock_mp_2.service_calls['media_previous_track']))
|
||||
|
||||
ump.media_next_track()
|
||||
self.assertEqual(
|
||||
1, len(self.mock_mp_2.service_calls['media_next_track']))
|
||||
|
||||
ump.media_seek(100)
|
||||
self.assertEqual(1, len(self.mock_mp_2.service_calls['media_seek']))
|
||||
|
||||
ump.play_media('movie', 'batman')
|
||||
self.assertEqual(1, len(self.mock_mp_2.service_calls['play_media']))
|
||||
|
||||
ump.volume_up()
|
||||
self.assertEqual(1, len(self.mock_mp_2.service_calls['volume_up']))
|
||||
|
||||
ump.volume_down()
|
||||
self.assertEqual(1, len(self.mock_mp_2.service_calls['volume_down']))
|
||||
|
||||
ump.media_play_pause()
|
||||
self.assertEqual(
|
||||
1, len(self.mock_mp_2.service_calls['media_play_pause']))
|
||||
|
||||
def test_service_call_to_command(self):
|
||||
"""Test service call to command."""
|
||||
config = self.config_children_only
|
||||
config['commands'] = \
|
||||
{'turn_off': {'service': 'test.turn_off', 'data': {}}}
|
||||
config['commands'] = {'turn_off': {
|
||||
'service': 'test.turn_off', 'data': {}}}
|
||||
universal.validate_config(config)
|
||||
|
||||
service = mock_service(self.hass, 'test', 'turn_off')
|
||||
|
||||
Reference in new issue
Block a user