Update homekit to use network integration (#52946)

This commit is contained in:
J. Nick Koston 2021-07-13 23:44:58 -10:00 committed by GitHub
parent c360d6009c
commit 30d465e9dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 20 deletions

View file

@ -156,7 +156,9 @@ async def test_setup_min(hass, mock_zeroconf):
)
entry.add_to_hass(hass)
with patch(f"{PATH_HOMEKIT}.HomeKit") as mock_homekit:
with patch(f"{PATH_HOMEKIT}.HomeKit") as mock_homekit, patch(
"homeassistant.components.network.async_get_source_ip", return_value="1.2.3.4"
):
mock_homekit.return_value = homekit = Mock()
type(homekit).async_start = AsyncMock()
assert await hass.config_entries.async_setup(entry.entry_id)
@ -166,7 +168,7 @@ async def test_setup_min(hass, mock_zeroconf):
hass,
BRIDGE_NAME,
DEFAULT_PORT,
None,
"1.2.3.4",
ANY,
ANY,
{},
@ -249,7 +251,7 @@ async def test_homekit_setup(hass, hk_driver, mock_zeroconf):
hass,
BRIDGE_NAME,
DEFAULT_PORT,
None,
IP_ADDRESS,
True,
{},
{},
@ -262,10 +264,7 @@ async def test_homekit_setup(hass, hk_driver, mock_zeroconf):
hass.states.async_set("light.demo", "on")
hass.states.async_set("light.demo2", "on")
zeroconf_mock = MagicMock()
with patch(
f"{PATH_HOMEKIT}.HomeDriver", return_value=hk_driver
) as mock_driver, patch("homeassistant.util.get_local_ip") as mock_ip:
mock_ip.return_value = IP_ADDRESS
with patch(f"{PATH_HOMEKIT}.HomeDriver", return_value=hk_driver) as mock_driver:
await hass.async_add_executor_job(homekit.setup, zeroconf_mock)
path = get_persist_fullpath_for_entry_id(hass, entry.entry_id)
@ -842,7 +841,9 @@ async def test_yaml_updates_update_config_entry_for_name(hass, mock_zeroconf):
)
entry.add_to_hass(hass)
with patch(f"{PATH_HOMEKIT}.HomeKit") as mock_homekit:
with patch(f"{PATH_HOMEKIT}.HomeKit") as mock_homekit, patch(
"homeassistant.components.network.async_get_source_ip", return_value="1.2.3.4"
):
mock_homekit.return_value = homekit = Mock()
type(homekit).async_start = AsyncMock()
assert await async_setup_component(
@ -854,7 +855,7 @@ async def test_yaml_updates_update_config_entry_for_name(hass, mock_zeroconf):
hass,
BRIDGE_NAME,
12345,
None,
"1.2.3.4",
ANY,
ANY,
{},
@ -1109,7 +1110,9 @@ async def test_reload(hass, mock_zeroconf):
)
entry.add_to_hass(hass)
with patch(f"{PATH_HOMEKIT}.HomeKit") as mock_homekit:
with patch(f"{PATH_HOMEKIT}.HomeKit") as mock_homekit, patch(
"homeassistant.components.network.async_get_source_ip", return_value="1.2.3.4"
):
mock_homekit.return_value = homekit = Mock()
assert await async_setup_component(
hass, "homekit", {"homekit": {CONF_NAME: "reloadable", CONF_PORT: 12345}}
@ -1120,7 +1123,7 @@ async def test_reload(hass, mock_zeroconf):
hass,
"reloadable",
12345,
None,
"1.2.3.4",
ANY,
False,
{},
@ -1142,6 +1145,8 @@ async def test_reload(hass, mock_zeroconf):
f"{PATH_HOMEKIT}.get_accessory"
), patch(
"pyhap.accessory_driver.AccessoryDriver.async_start"
), patch(
"homeassistant.components.network.async_get_source_ip", return_value="1.2.3.4"
):
mock_homekit2.return_value = homekit = Mock()
await hass.services.async_call(
@ -1156,7 +1161,7 @@ async def test_reload(hass, mock_zeroconf):
hass,
"reloadable",
45678,
None,
"1.2.3.4",
ANY,
False,
{},