Merge branch 'pr/1643' into dev

Conflicts:
	requirements_all.txt
This commit is contained in:
Paulus Schoutsen committed 2016-03-29 23:23:45 -07:00
commit 5b00919bed
10 files changed
+254 -4

No files matched your search

@@ -19,6 +19,25 @@ class TestDemoMediaPlayer(unittest.TestCase):
"""Stop everything that was started."""
self.hass.stop()
def test_source_select(self):
"""Test the input source service."""
entity_id = 'media_player.receiver'
assert mp.setup(self.hass, {'media_player': {'platform': 'demo'}})
state = self.hass.states.get(entity_id)
assert 'dvd' == state.attributes.get('source')
mp.select_source(self.hass, None, entity_id)
self.hass.pool.block_till_done()
state = self.hass.states.get(entity_id)
assert 'dvd' == state.attributes.get('source')
mp.select_source(self.hass, 'xbox', entity_id)
self.hass.pool.block_till_done()
state = self.hass.states.get(entity_id)
assert 'xbox' == state.attributes.get('source')
def test_volume_services(self):
"""Test the volume service."""
assert mp.setup(self.hass, {'media_player': {'platform': 'demo'}})
@@ -24,6 +24,7 @@ class MockMediaPlayer(media_player.MediaPlayerDevice):
self._is_volume_muted = False
self._media_title = None
self._supported_media_commands = 0
self._source = None
self.service_calls = {
'turn_on': mock_service(
@@ -55,6 +56,9 @@ class MockMediaPlayer(media_player.MediaPlayerDevice):
'media_play_pause': mock_service(
hass, media_player.DOMAIN,
media_player.SERVICE_MEDIA_PLAY_PAUSE),
'select_source': mock_service(
hass, media_player.DOMAIN,
media_player.SERVICE_SELECT_SOURCE),
}
@property
@@ -106,6 +110,10 @@ class MockMediaPlayer(media_player.MediaPlayerDevice):
"""Mock pause."""
self._state = STATE_PAUSED
def select_source(self, source):
"""Set the input source."""
self._state = source
class TestMediaPlayer(unittest.TestCase):
"""Test the media_player module."""
@@ -498,6 +506,10 @@ class TestMediaPlayer(unittest.TestCase):
self.assertEqual(
1, len(self.mock_mp_2.service_calls['media_play_pause']))
ump.select_source('dvd')
self.assertEqual(
1, len(self.mock_mp_2.service_calls['select_source']))
def test_service_call_to_command(self):
"""Test service call to command."""
config = self.config_children_only