evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make interface_choice option effective (#35444)

Browse source 
I missed the second commit that actually makes this
work in the original merge.
This commit is contained in:
J. Nick Koston 2020-05-10 14:30:54 -05:00 • committed by GitHub
parent e4263afd64
commit 70b29dc823
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
homeassistant/components/zeroconf/__init__.py
View file

@ -56,7 +56,7 @@ CONFIG_SCHEMA = vol.Schema(
def setup(hass, config): def setup(hass, config):
"""Set up Zeroconf and make Home Assistant discoverable.""" """Set up Zeroconf and make Home Assistant discoverable."""
if config.get(CONF_DEFAULT_INTERFACE): if DOMAIN in config and config[DOMAIN].get(CONF_DEFAULT_INTERFACE):
zeroconf = Zeroconf(interfaces=InterfaceChoice.Default) zeroconf = Zeroconf(interfaces=InterfaceChoice.Default)
else: else:
zeroconf = Zeroconf() zeroconf = Zeroconf()

13
tests/components/zeroconf/test_init.py
View file

@ -92,6 +92,19 @@ async def test_setup_with_default_interface(hass, mock_zeroconf):
assert mock_zeroconf.called_with(interface_choice=InterfaceChoice.Default) assert mock_zeroconf.called_with(interface_choice=InterfaceChoice.Default)
async def test_setup_without_default_interface(hass, mock_zeroconf):
"""Test without default interface config."""
with patch.object(hass.config_entries.flow, "async_init"), patch.object(
zeroconf, "ServiceBrowser", side_effect=service_update_mock
):
mock_zeroconf.get_service_info.side_effect = get_service_info_mock
assert await async_setup_component(
hass, zeroconf.DOMAIN, {zeroconf.DOMAIN: {CONF_DEFAULT_INTERFACE: False}}
)
assert mock_zeroconf.called_with()
async def test_homekit_match_partial_space(hass, mock_zeroconf): async def test_homekit_match_partial_space(hass, mock_zeroconf):
"""Test configured options for a device are loaded via config entry.""" """Test configured options for a device are loaded via config entry."""
with patch.dict( with patch.dict(