Merge remote-tracking branch 'upstream/master' into abtract_query_scheduler

bdraco · bdraco · commit 7f49c61b1df3 · 2021-06-22T16:49:09.000-10:00
diff --git a/tests/__init__.py b/tests/__init__.py
@@ -41,6 +41,12 @@ async def _wait_for_response():
     asyncio.run_coroutine_threadsafe(_wait_for_response(), zc.loop).result()
 
 
+def _wait_for_start(zc: Zeroconf) -> None:
+    """Wait for all sockets to be up and running."""
+    assert zc.loop is not None
+    asyncio.run_coroutine_threadsafe(zc.async_wait_for_start(), zc.loop).result()
+
+
 @lru_cache(maxsize=None)
 def has_working_ipv6():
     """Return True if if the system can bind an IPv6 address."""
diff --git a/tests/services/test_browser.py b/tests/services/test_browser.py
@@ -23,7 +23,7 @@
 from zeroconf._services.info import ServiceInfo
 from zeroconf.aio import AsyncZeroconf
 
-from .. import has_working_ipv6, _inject_response
+from .. import has_working_ipv6, _inject_response, _wait_for_start
 
 
 log = logging.getLogger('zeroconf')
@@ -436,6 +436,7 @@ def test_backoff(suppresses_mock):
 
     type_ = "_http._tcp.local."
     zeroconf_browser = Zeroconf(interfaces=['127.0.0.1'])
+    _wait_for_start(zeroconf_browser)
 
     # we are going to patch the zeroconf send to check query transmission
     old_send = zeroconf_browser.async_send
@@ -509,6 +510,7 @@ def test_first_query_delay():
     """
     type_ = "_http._tcp.local."
     zeroconf_browser = Zeroconf(interfaces=['127.0.0.1'])
+    _wait_for_start(zeroconf_browser)
 
     # we are going to patch the zeroconf send to check query transmission
     old_send = zeroconf_browser.async_send
@@ -662,6 +664,7 @@ def on_service_state_change(zeroconf, service_type, state_change, name):
                 service_removed.set()
 
     zeroconf_browser = Zeroconf(interfaces=['127.0.0.1'])
+    _wait_for_start(zeroconf_browser)
 
     # we are going to patch the zeroconf send to check packet sizes
     old_send = zeroconf_browser.async_send
