From c8043eccc9b0a1cc7530a9bc1e6b118a0e92646b Mon Sep 17 00:00:00 2001 From: epenet <6771947+epenet@users.noreply.github.com> Date: Thu, 13 Jan 2022 15:32:39 +0100 Subject: [PATCH] Fix yamaha discovery (#64056) Co-authored-by: epenet --- homeassistant/components/yamaha/media_player.py | 10 +++++----- tests/components/yamaha/test_media_player.py | 6 ------ 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/homeassistant/components/yamaha/media_player.py b/homeassistant/components/yamaha/media_player.py index 3b4579ac0e5..4a816b99aca 100644 --- a/homeassistant/components/yamaha/media_player.py +++ b/homeassistant/components/yamaha/media_player.py @@ -108,10 +108,10 @@ class YamahaConfigInfo: self.name = config.get(CONF_NAME) self.host = config.get(CONF_HOST) self.ctrl_url: str | None = f"http://{self.host}:80/YamahaRemoteControl/ctrl" - self.source_ignore = config[CONF_SOURCE_IGNORE] - self.source_names = config[CONF_SOURCE_NAMES] - self.zone_ignore = config[CONF_ZONE_IGNORE] - self.zone_names = config[CONF_ZONE_NAMES] + self.source_ignore = config.get(CONF_SOURCE_IGNORE) + self.source_names = config.get(CONF_SOURCE_NAMES) + self.zone_ignore = config.get(CONF_ZONE_IGNORE) + self.zone_names = config.get(CONF_ZONE_NAMES) self.from_discovery = False if discovery_info is not None: self.name = discovery_info.get("name") @@ -161,7 +161,7 @@ async def async_setup_platform( entities = [] for receiver in receivers: - if receiver.zone in config_info.zone_ignore: + if config_info.zone_ignore and receiver.zone in config_info.zone_ignore: continue entity = YamahaDevice( diff --git a/tests/components/yamaha/test_media_player.py b/tests/components/yamaha/test_media_player.py index 05a380bde27..45624ae0a8b 100644 --- a/tests/components/yamaha/test_media_player.py +++ b/tests/components/yamaha/test_media_player.py @@ -74,12 +74,6 @@ async def test_setup_no_host(hass, device, main_zone): async def test_setup_discovery(hass, device, main_zone): """Test set up integration via discovery.""" - with patch("rxv.find", return_value=[device]): - assert await async_setup_component( - hass, "media_player", {"media_player": {"platform": "yamaha"}} - ) - await hass.async_block_till_done() - discovery_info = { "name": "Yamaha Receiver", "model_name": "Yamaha",