Improve config schema of the blackbird component (#14007)
* Import moved, return values removed and redundant log message removed * Improve config schema of the blackbird component * Tests updated * Handle updated * Schema fixed
This commit is contained in:
1 parent
e968b1a0f4
commit
8b13658d3b
2 files changed
+44
-55
No files matched your search
@@ -59,7 +59,6 @@ class TestBlackbirdSchema(unittest.TestCase):
|
||||
"""Test valid schema."""
|
||||
valid_schema = {
|
||||
'platform': 'blackbird',
|
||||
'type': 'serial',
|
||||
'port': '/dev/ttyUSB0',
|
||||
'zones': {1: {'name': 'a'},
|
||||
2: {'name': 'a'},
|
||||
@@ -87,8 +86,7 @@ class TestBlackbirdSchema(unittest.TestCase):
|
||||
"""Test valid schema."""
|
||||
valid_schema = {
|
||||
'platform': 'blackbird',
|
||||
'type': 'socket',
|
||||
'port': '192.168.1.50',
|
||||
'host': '192.168.1.50',
|
||||
'zones': {1: {'name': 'a'},
|
||||
2: {'name': 'a'},
|
||||
3: {'name': 'a'},
|
||||
@@ -109,10 +107,18 @@ class TestBlackbirdSchema(unittest.TestCase):
|
||||
schemas = (
|
||||
{}, # Empty
|
||||
None, # None
|
||||
# Missing type
|
||||
# Port and host used concurrently
|
||||
{
|
||||
'platform': 'blackbird',
|
||||
'port': '/dev/ttyUSB0',
|
||||
'host': '192.168.1.50',
|
||||
'name': 'Name',
|
||||
'zones': {1: {'name': 'a'}},
|
||||
'sources': {1: {'name': 'b'}},
|
||||
},
|
||||
# Port or host missing
|
||||
{
|
||||
'platform': 'blackbird',
|
||||
'port': 'aaa',
|
||||
'name': 'Name',
|
||||
'zones': {1: {'name': 'a'}},
|
||||
'sources': {1: {'name': 'b'}},
|
||||
@@ -120,8 +126,7 @@ class TestBlackbirdSchema(unittest.TestCase):
|
||||
# Invalid zone number
|
||||
{
|
||||
'platform': 'blackbird',
|
||||
'type': 'serial',
|
||||
'port': 'aaa',
|
||||
'port': '/dev/ttyUSB0',
|
||||
'name': 'Name',
|
||||
'zones': {11: {'name': 'a'}},
|
||||
'sources': {1: {'name': 'b'}},
|
||||
@@ -129,8 +134,7 @@ class TestBlackbirdSchema(unittest.TestCase):
|
||||
# Invalid source number
|
||||
{
|
||||
'platform': 'blackbird',
|
||||
'type': 'serial',
|
||||
'port': 'aaa',
|
||||
'port': '/dev/ttyUSB0',
|
||||
'name': 'Name',
|
||||
'zones': {1: {'name': 'a'}},
|
||||
'sources': {9: {'name': 'b'}},
|
||||
@@ -138,8 +142,7 @@ class TestBlackbirdSchema(unittest.TestCase):
|
||||
# Zone missing name
|
||||
{
|
||||
'platform': 'blackbird',
|
||||
'type': 'serial',
|
||||
'port': 'aaa',
|
||||
'port': '/dev/ttyUSB0',
|
||||
'name': 'Name',
|
||||
'zones': {1: {}},
|
||||
'sources': {1: {'name': 'b'}},
|
||||
@@ -147,21 +150,11 @@ class TestBlackbirdSchema(unittest.TestCase):
|
||||
# Source missing name
|
||||
{
|
||||
'platform': 'blackbird',
|
||||
'type': 'serial',
|
||||
'port': 'aaa',
|
||||
'port': '/dev/ttyUSB0',
|
||||
'name': 'Name',
|
||||
'zones': {1: {'name': 'a'}},
|
||||
'sources': {1: {}},
|
||||
},
|
||||
# Invalid type
|
||||
{
|
||||
'platform': 'blackbird',
|
||||
'type': 'aaa',
|
||||
'port': 'aaa',
|
||||
'name': 'Name',
|
||||
'zones': {1: {'name': 'a'}},
|
||||
'sources': {1: {'name': 'b'}},
|
||||
},
|
||||
)
|
||||
for value in schemas:
|
||||
with self.assertRaises(vol.MultipleInvalid):
|
||||
@@ -181,7 +174,6 @@ class TestBlackbirdMediaPlayer(unittest.TestCase):
|
||||
new=lambda *a: self.blackbird):
|
||||
setup_platform(self.hass, {
|
||||
'platform': 'blackbird',
|
||||
'type': 'serial',
|
||||
'port': '/dev/ttyUSB0',
|
||||
'zones': {3: {'name': 'Zone name'}},
|
||||
'sources': {1: {'name': 'one'},
|
||||
@@ -189,7 +181,7 @@ class TestBlackbirdMediaPlayer(unittest.TestCase):
|
||||
2: {'name': 'two'}},
|
||||
}, lambda *args, **kwargs: None, {})
|
||||
self.hass.block_till_done()
|
||||
self.media_player = self.hass.data[DATA_BLACKBIRD][0]
|
||||
self.media_player = self.hass.data[DATA_BLACKBIRD]['/dev/ttyUSB0-3']
|
||||
self.media_player.hass = self.hass
|
||||
self.media_player.entity_id = 'media_player.zone_3'
|
||||
|
||||
@@ -203,7 +195,8 @@ class TestBlackbirdMediaPlayer(unittest.TestCase):
|
||||
self.assertTrue(self.hass.services.has_service(DOMAIN,
|
||||
SERVICE_SETALLZONES))
|
||||
self.assertEqual(len(self.hass.data[DATA_BLACKBIRD]), 1)
|
||||
self.assertEqual(self.hass.data[DATA_BLACKBIRD][0].name, 'Zone name')
|
||||
self.assertEqual(self.hass.data[DATA_BLACKBIRD]['/dev/ttyUSB0-3'].name,
|
||||
'Zone name')
|
||||
|
||||
def test_setallzones_service_call_with_entity_id(self):
|
||||
"""Test set all zone source service call with entity id."""
|
||||
|
||||
Reference in new issue
Block a user