Refactor zeroconf setup to be async (#39955)
* Refactor zeroconf setup to be async Most of the setup was calling back to async because we were setting up listeners. Since we only need to jump into the executor to create the zeroconf instance, its much faster to setup in async. In testing this cut the setup time in half or better. * partial revert to after_deps
This commit is contained in:
1 parent
00acb180d6
commit
7b016063ca
10 files changed
+84
-91
No files matched your search
@@ -1,4 +1,5 @@
|
||||
"""Test Home Assistant Cast."""
|
||||
|
||||
from homeassistant.components.cast import home_assistant_cast
|
||||
from homeassistant.config import async_process_ha_core_config
|
||||
|
||||
@@ -6,7 +7,7 @@ from tests.async_mock import patch
|
||||
from tests.common import MockConfigEntry, async_mock_signal
|
||||
|
||||
|
||||
async def test_service_show_view(hass):
|
||||
async def test_service_show_view(hass, mock_zeroconf):
|
||||
"""Test we don't set app id in prod."""
|
||||
await async_process_ha_core_config(
|
||||
hass,
|
||||
@@ -33,7 +34,7 @@ async def test_service_show_view(hass):
|
||||
assert url_path is None
|
||||
|
||||
|
||||
async def test_service_show_view_dashboard(hass):
|
||||
async def test_service_show_view_dashboard(hass, mock_zeroconf):
|
||||
"""Test casting a specific dashboard."""
|
||||
await async_process_ha_core_config(
|
||||
hass,
|
||||
@@ -60,7 +61,7 @@ async def test_service_show_view_dashboard(hass):
|
||||
assert url_path == "mock-dashboard"
|
||||
|
||||
|
||||
async def test_use_cloud_url(hass):
|
||||
async def test_use_cloud_url(hass, mock_zeroconf):
|
||||
"""Test that we fall back to cloud url."""
|
||||
await async_process_ha_core_config(
|
||||
hass,
|
||||
|
||||
@@ -6,13 +6,6 @@ from homeassistant.setup import async_setup_component
|
||||
from tests.async_mock import patch
|
||||
|
||||
|
||||
@pytest.fixture(autouse=True)
|
||||
def mock_zeroconf():
|
||||
"""Mock zeroconf."""
|
||||
with patch("homeassistant.components.zeroconf.HaZeroconf"):
|
||||
yield
|
||||
|
||||
|
||||
@pytest.fixture(autouse=True)
|
||||
def mock_ssdp():
|
||||
"""Mock ssdp."""
|
||||
@@ -34,6 +27,6 @@ def recorder_url_mock():
|
||||
yield
|
||||
|
||||
|
||||
async def test_setup(hass):
|
||||
async def test_setup(hass, mock_zeroconf):
|
||||
"""Test setup."""
|
||||
assert await async_setup_component(hass, "default_config", {"foo": "bar"})
|
||||
@@ -37,7 +37,9 @@ def netdisco_mock():
|
||||
|
||||
async def mock_discovery(hass, discoveries, config=BASE_CONFIG):
|
||||
"""Mock discoveries."""
|
||||
with patch("homeassistant.components.zeroconf.async_get_instance"):
|
||||
with patch("homeassistant.components.zeroconf.async_get_instance"), patch(
|
||||
"homeassistant.components.zeroconf.async_setup", return_value=True
|
||||
):
|
||||
assert await async_setup_component(hass, "discovery", config)
|
||||
await hass.async_block_till_done()
|
||||
await hass.async_start()
|
||||
|
||||
@@ -29,10 +29,3 @@ def events(hass):
|
||||
EVENT_HOMEKIT_CHANGED, ha_callback(lambda e: events.append(e))
|
||||
)
|
||||
yield events
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def mock_zeroconf():
|
||||
"""Mock zeroconf."""
|
||||
with patch("homeassistant.components.zeroconf.HaZeroconf") as mock_zc:
|
||||
yield mock_zc.return_value
|
||||
@@ -1018,6 +1018,7 @@ async def test_homekit_uses_system_zeroconf(hass, hk_driver, mock_zeroconf):
|
||||
data={CONF_NAME: BRIDGE_NAME, CONF_PORT: DEFAULT_PORT},
|
||||
options={},
|
||||
)
|
||||
assert await async_setup_component(hass, "zeroconf", {"zeroconf": {}})
|
||||
system_zc = await zeroconf.async_get_instance(hass)
|
||||
|
||||
with patch("pyhap.accessory_driver.AccessoryDriver.start_service"), patch(
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
"""conftest for zeroconf."""
|
||||
import pytest
|
||||
|
||||
from tests.async_mock import patch
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def mock_zeroconf():
|
||||
"""Mock zeroconf."""
|
||||
with patch("homeassistant.components.zeroconf.HaZeroconf") as mock_zc:
|
||||
yield mock_zc.return_value
|
||||
@@ -9,7 +9,11 @@ from zeroconf import (
|
||||
|
||||
from homeassistant.components import zeroconf
|
||||
from homeassistant.components.zeroconf import CONF_DEFAULT_INTERFACE, CONF_IPV6
|
||||
from homeassistant.const import EVENT_HOMEASSISTANT_STARTED, EVENT_HOMEASSISTANT_STOP
|
||||
from homeassistant.const import (
|
||||
EVENT_HOMEASSISTANT_START,
|
||||
EVENT_HOMEASSISTANT_STARTED,
|
||||
EVENT_HOMEASSISTANT_STOP,
|
||||
)
|
||||
from homeassistant.generated import zeroconf as zc_gen
|
||||
from homeassistant.setup import async_setup_component
|
||||
|
||||
@@ -128,7 +132,7 @@ async def test_setup_with_overly_long_url_and_name(hass, mock_zeroconf, caplog):
|
||||
"""Test we still setup with long urls and names."""
|
||||
with patch.object(hass.config_entries.flow, "async_init"), patch.object(
|
||||
zeroconf, "HaServiceBrowser", side_effect=service_update_mock
|
||||
) as mock_service_browser, patch(
|
||||
), patch(
|
||||
"homeassistant.components.zeroconf.get_url",
|
||||
return_value="https://this.url.is.way.too.long/very/deep/path/that/will/make/us/go/over/the/maximum/string/length/and/would/cause/zeroconf/to/fail/to/startup/because/the/key/and/value/can/only/be/255/bytes/and/this/string/is/a/bit/longer/than/the/maximum/length/that/we/allow/for/a/value",
|
||||
), patch.object(
|
||||
@@ -138,10 +142,9 @@ async def test_setup_with_overly_long_url_and_name(hass, mock_zeroconf, caplog):
|
||||
):
|
||||
mock_zeroconf.get_service_info.side_effect = get_service_info_mock
|
||||
assert await async_setup_component(hass, zeroconf.DOMAIN, {zeroconf.DOMAIN: {}})
|
||||
hass.bus.async_fire(EVENT_HOMEASSISTANT_STARTED)
|
||||
hass.bus.async_fire(EVENT_HOMEASSISTANT_START)
|
||||
await hass.async_block_till_done()
|
||||
|
||||
assert len(mock_service_browser.mock_calls) == 1
|
||||
assert "https://this.url.is.way.too.long" in caplog.text
|
||||
assert "German Umlaut" in caplog.text
|
||||
|
||||
@@ -461,6 +464,7 @@ async def test_info_from_service_with_addresses(hass):
|
||||
|
||||
async def test_get_instance(hass, mock_zeroconf):
|
||||
"""Test we get an instance."""
|
||||
assert await async_setup_component(hass, zeroconf.DOMAIN, {zeroconf.DOMAIN: {}})
|
||||
assert await hass.components.zeroconf.async_get_instance() is mock_zeroconf
|
||||
hass.bus.async_fire(EVENT_HOMEASSISTANT_STOP)
|
||||
await hass.async_block_till_done()
|
||||
|
||||
@@ -3,12 +3,16 @@ import zeroconf
|
||||
|
||||
from homeassistant.components.zeroconf import async_get_instance
|
||||
from homeassistant.components.zeroconf.usage import install_multiple_zeroconf_catcher
|
||||
from homeassistant.setup import async_setup_component
|
||||
|
||||
from tests.async_mock import Mock, patch
|
||||
|
||||
DOMAIN = "zeroconf"
|
||||
|
||||
|
||||
async def test_multiple_zeroconf_instances(hass, mock_zeroconf, caplog):
|
||||
"""Test creating multiple zeroconf throws without an integration."""
|
||||
assert await async_setup_component(hass, DOMAIN, {DOMAIN: {}})
|
||||
|
||||
zeroconf_instance = await async_get_instance(hass)
|
||||
|
||||
@@ -22,6 +26,7 @@ async def test_multiple_zeroconf_instances(hass, mock_zeroconf, caplog):
|
||||
|
||||
async def test_multiple_zeroconf_instances_gives_shared(hass, mock_zeroconf, caplog):
|
||||
"""Test creating multiple zeroconf gives the shared instance to an integration."""
|
||||
assert await async_setup_component(hass, DOMAIN, {DOMAIN: {}})
|
||||
|
||||
zeroconf_instance = await async_get_instance(hass)
|
||||
|
||||
|
||||
Reference in new issue
Block a user