Limit zeroconf discovery to name/macaddress when provided (#39877)
Co-authored-by: Paulus Schoutsen <paulus@home-assistant.io>
This commit is contained in:
1 parent
487a74ba5d
commit
9389a7c9be
12 files changed
+306
-56
No files matched your search
@@ -79,6 +79,24 @@ def get_homekit_info_mock(model, pairing_status):
|
||||
return mock_homekit_info
|
||||
|
||||
|
||||
def get_zeroconf_info_mock(macaddress):
|
||||
"""Return info for get_service_info for an zeroconf device."""
|
||||
|
||||
def mock_zc_info(service_type, name):
|
||||
return ServiceInfo(
|
||||
service_type,
|
||||
name,
|
||||
addresses=[b"\n\x00\x00\x14"],
|
||||
port=80,
|
||||
weight=0,
|
||||
priority=0,
|
||||
server="name.local.",
|
||||
properties={b"macaddress": macaddress.encode()},
|
||||
)
|
||||
|
||||
return mock_zc_info
|
||||
|
||||
|
||||
async def test_setup(hass, mock_zeroconf):
|
||||
"""Test configured options for a device are loaded via config entry."""
|
||||
with patch.object(
|
||||
@@ -94,7 +112,11 @@ async def test_setup(hass, mock_zeroconf):
|
||||
assert len(mock_service_browser.mock_calls) == 1
|
||||
expected_flow_calls = 0
|
||||
for matching_components in zc_gen.ZEROCONF.values():
|
||||
expected_flow_calls += len(matching_components)
|
||||
domains = set()
|
||||
for component in matching_components:
|
||||
if len(component) == 1:
|
||||
domains.add(component["domain"])
|
||||
expected_flow_calls += len(domains)
|
||||
assert len(mock_config_flow.mock_calls) == expected_flow_calls
|
||||
|
||||
# Test instance is set.
|
||||
@@ -209,10 +231,77 @@ async def test_service_with_invalid_name(hass, mock_zeroconf, caplog):
|
||||
assert "Failed to get info for device name" in caplog.text
|
||||
|
||||
|
||||
async def test_zeroconf_match(hass, mock_zeroconf):
|
||||
"""Test configured options for a device are loaded via config entry."""
|
||||
|
||||
def http_only_service_update_mock(zeroconf, services, handlers):
|
||||
"""Call service update handler."""
|
||||
handlers[0](
|
||||
zeroconf,
|
||||
"_http._tcp.local.",
|
||||
"shelly108._http._tcp.local.",
|
||||
ServiceStateChange.Added,
|
||||
)
|
||||
|
||||
with patch.dict(
|
||||
zc_gen.ZEROCONF,
|
||||
{"_http._tcp.local.": [{"domain": "shelly", "name": "shelly*"}]},
|
||||
clear=True,
|
||||
), patch.object(
|
||||
hass.config_entries.flow, "async_init"
|
||||
) as mock_config_flow, patch.object(
|
||||
zeroconf, "HaServiceBrowser", side_effect=http_only_service_update_mock
|
||||
) as mock_service_browser:
|
||||
mock_zeroconf.get_service_info.side_effect = get_zeroconf_info_mock(
|
||||
"FFAADDCC11DD"
|
||||
)
|
||||
assert await async_setup_component(hass, zeroconf.DOMAIN, {zeroconf.DOMAIN: {}})
|
||||
hass.bus.async_fire(EVENT_HOMEASSISTANT_STARTED)
|
||||
await hass.async_block_till_done()
|
||||
|
||||
assert len(mock_service_browser.mock_calls) == 1
|
||||
assert len(mock_config_flow.mock_calls) == 1
|
||||
assert mock_config_flow.mock_calls[0][1][0] == "shelly"
|
||||
|
||||
|
||||
async def test_zeroconf_no_match(hass, mock_zeroconf):
|
||||
"""Test configured options for a device are loaded via config entry."""
|
||||
|
||||
def http_only_service_update_mock(zeroconf, services, handlers):
|
||||
"""Call service update handler."""
|
||||
handlers[0](
|
||||
zeroconf,
|
||||
"_http._tcp.local.",
|
||||
"somethingelse._http._tcp.local.",
|
||||
ServiceStateChange.Added,
|
||||
)
|
||||
|
||||
with patch.dict(
|
||||
zc_gen.ZEROCONF,
|
||||
{"_http._tcp.local.": [{"domain": "shelly", "name": "shelly*"}]},
|
||||
clear=True,
|
||||
), patch.object(
|
||||
hass.config_entries.flow, "async_init"
|
||||
) as mock_config_flow, patch.object(
|
||||
zeroconf, "HaServiceBrowser", side_effect=http_only_service_update_mock
|
||||
) as mock_service_browser:
|
||||
mock_zeroconf.get_service_info.side_effect = get_zeroconf_info_mock(
|
||||
"FFAADDCC11DD"
|
||||
)
|
||||
assert await async_setup_component(hass, zeroconf.DOMAIN, {zeroconf.DOMAIN: {}})
|
||||
hass.bus.async_fire(EVENT_HOMEASSISTANT_STARTED)
|
||||
await hass.async_block_till_done()
|
||||
|
||||
assert len(mock_service_browser.mock_calls) == 1
|
||||
assert len(mock_config_flow.mock_calls) == 0
|
||||
|
||||
|
||||
async def test_homekit_match_partial_space(hass, mock_zeroconf):
|
||||
"""Test configured options for a device are loaded via config entry."""
|
||||
with patch.dict(
|
||||
zc_gen.ZEROCONF, {zeroconf.HOMEKIT_TYPE: ["homekit_controller"]}, clear=True
|
||||
zc_gen.ZEROCONF,
|
||||
{zeroconf.HOMEKIT_TYPE: [{"domain": "homekit_controller"}]},
|
||||
clear=True,
|
||||
), patch.object(
|
||||
hass.config_entries.flow, "async_init"
|
||||
) as mock_config_flow, patch.object(
|
||||
@@ -233,7 +322,9 @@ async def test_homekit_match_partial_space(hass, mock_zeroconf):
|
||||
async def test_homekit_match_partial_dash(hass, mock_zeroconf):
|
||||
"""Test configured options for a device are loaded via config entry."""
|
||||
with patch.dict(
|
||||
zc_gen.ZEROCONF, {zeroconf.HOMEKIT_TYPE: ["homekit_controller"]}, clear=True
|
||||
zc_gen.ZEROCONF,
|
||||
{zeroconf.HOMEKIT_TYPE: [{"domain": "homekit_controller"}]},
|
||||
clear=True,
|
||||
), patch.object(
|
||||
hass.config_entries.flow, "async_init"
|
||||
) as mock_config_flow, patch.object(
|
||||
@@ -254,7 +345,9 @@ async def test_homekit_match_partial_dash(hass, mock_zeroconf):
|
||||
async def test_homekit_match_full(hass, mock_zeroconf):
|
||||
"""Test configured options for a device are loaded via config entry."""
|
||||
with patch.dict(
|
||||
zc_gen.ZEROCONF, {zeroconf.HOMEKIT_TYPE: ["homekit_controller"]}, clear=True
|
||||
zc_gen.ZEROCONF,
|
||||
{zeroconf.HOMEKIT_TYPE: [{"domain": "homekit_controller"}]},
|
||||
clear=True,
|
||||
), patch.object(
|
||||
hass.config_entries.flow, "async_init"
|
||||
) as mock_config_flow, patch.object(
|
||||
@@ -267,11 +360,6 @@ async def test_homekit_match_full(hass, mock_zeroconf):
|
||||
hass.bus.async_fire(EVENT_HOMEASSISTANT_STARTED)
|
||||
await hass.async_block_till_done()
|
||||
|
||||
homekit_mock = get_homekit_info_mock("BSB002", HOMEKIT_STATUS_UNPAIRED)
|
||||
info = homekit_mock("_hap._tcp.local.", "BSB002._hap._tcp.local.")
|
||||
import pprint
|
||||
|
||||
pprint.pprint(["homekit", info])
|
||||
assert len(mock_service_browser.mock_calls) == 1
|
||||
assert len(mock_config_flow.mock_calls) == 1
|
||||
assert mock_config_flow.mock_calls[0][1][0] == "hue"
|
||||
@@ -280,7 +368,9 @@ async def test_homekit_match_full(hass, mock_zeroconf):
|
||||
async def test_homekit_already_paired(hass, mock_zeroconf):
|
||||
"""Test that an already paired device is sent to homekit_controller."""
|
||||
with patch.dict(
|
||||
zc_gen.ZEROCONF, {zeroconf.HOMEKIT_TYPE: ["homekit_controller"]}, clear=True
|
||||
zc_gen.ZEROCONF,
|
||||
{zeroconf.HOMEKIT_TYPE: [{"domain": "homekit_controller"}]},
|
||||
clear=True,
|
||||
), patch.object(
|
||||
hass.config_entries.flow, "async_init"
|
||||
) as mock_config_flow, patch.object(
|
||||
@@ -302,7 +392,9 @@ async def test_homekit_already_paired(hass, mock_zeroconf):
|
||||
async def test_homekit_invalid_paring_status(hass, mock_zeroconf):
|
||||
"""Test that missing paring data is not sent to homekit_controller."""
|
||||
with patch.dict(
|
||||
zc_gen.ZEROCONF, {zeroconf.HOMEKIT_TYPE: ["homekit_controller"]}, clear=True
|
||||
zc_gen.ZEROCONF,
|
||||
{zeroconf.HOMEKIT_TYPE: [{"domain": "homekit_controller"}]},
|
||||
clear=True,
|
||||
), patch.object(
|
||||
hass.config_entries.flow, "async_init"
|
||||
) as mock_config_flow, patch.object(
|
||||
@@ -323,7 +415,9 @@ async def test_homekit_invalid_paring_status(hass, mock_zeroconf):
|
||||
async def test_homekit_not_paired(hass, mock_zeroconf):
|
||||
"""Test that an not paired device is sent to homekit_controller."""
|
||||
with patch.dict(
|
||||
zc_gen.ZEROCONF, {zeroconf.HOMEKIT_TYPE: ["homekit_controller"]}, clear=True
|
||||
zc_gen.ZEROCONF,
|
||||
{zeroconf.HOMEKIT_TYPE: [{"domain": "homekit_controller"}]},
|
||||
clear=True,
|
||||
), patch.object(
|
||||
hass.config_entries.flow, "async_init"
|
||||
) as mock_config_flow, patch.object(
|
||||
|
||||
Reference in new issue
Block a user