zeroconf 0.149.2__tar.gz → 0.149.4__tar.gz

{zeroconf-0.149.2 → zeroconf-0.149.4}/CHANGELOG.md

@@ -2,6 +2,46 @@
 
 <!-- version list -->
 
+## v0.149.4 (2026-05-17)
+
+### Bug Fixes
+
+- **core**: Release sockets when close runs before engine setup completes
+  ([#1706](https://github.com/python-zeroconf/python-zeroconf/pull/1706),
+  [`0deb56b`](https://github.com/python-zeroconf/python-zeroconf/commit/0deb56b78fe6cd701a43ce34dccd4b69d6dd6d36))
+
+### Testing
+
+- Drop pending multicast responses before TOCTOU assertion
+  ([#1701](https://github.com/python-zeroconf/python-zeroconf/pull/1701),
+  [`d2058d9`](https://github.com/python-zeroconf/python-zeroconf/commit/d2058d95882c70fb2eb786d373a630314e656c15))
+
+- Speed up slow loopback tests (closes #1697)
+  ([#1699](https://github.com/python-zeroconf/python-zeroconf/pull/1699),
+  [`dd341a3`](https://github.com/python-zeroconf/python-zeroconf/commit/dd341a378e904cbf9b9a09e5c2ac8ff7c9944cd0))
+
+- Speed up slow loopback tests (closes #1700)
+  ([#1703](https://github.com/python-zeroconf/python-zeroconf/pull/1703),
+  [`d03ea36`](https://github.com/python-zeroconf/python-zeroconf/commit/d03ea364dea5866e0301ff11f6b78714ecf991e8))
+
+- Speed up test_async_wait_unblocks_on_update
+  ([#1702](https://github.com/python-zeroconf/python-zeroconf/pull/1702),
+  [`653c385`](https://github.com/python-zeroconf/python-zeroconf/commit/653c38559c468672cf907d808d432dec0fb06968))
+
+- Widen scheduling buffer in flaky get_info suppression test
+  ([#1698](https://github.com/python-zeroconf/python-zeroconf/pull/1698),
+  [`9b4db62`](https://github.com/python-zeroconf/python-zeroconf/commit/9b4db625e121c2d590ed8fe2f4d187d5e3bb9a73))
+
+
+## v0.149.3 (2026-05-17)
+
+### Bug Fixes
+
+- **ci**: Drop x86_64 mac wheels and clean up obsolete CIBW_SKIP entries
+  ([#1694](https://github.com/python-zeroconf/python-zeroconf/pull/1694),
+  [`104c5d6`](https://github.com/python-zeroconf/python-zeroconf/commit/104c5d6674896612aa83a89fd17b90de5f38a508))
+
+
 ## v0.149.2 (2026-05-17)
 
 ### Bug Fixes

{zeroconf-0.149.2 → zeroconf-0.149.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zeroconf
-Version: 0.149.2
+Version: 0.149.4
 Summary: A pure python implementation of multicast DNS service discovery
 License-Expression: LGPL-2.1-or-later
 License-File: COPYING

{zeroconf-0.149.2 → zeroconf-0.149.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name = "zeroconf"
-version = "0.149.2"
+version = "0.149.4"
 license = "LGPL-2.1-or-later"
 description = "A pure python implementation of multicast DNS service discovery"
 readme = "README.rst"

{zeroconf-0.149.2 → zeroconf-0.149.4}/setup.py

@@ -19,7 +19,7 @@ install_requires = \
 
 setup_kwargs = {
     'name': 'zeroconf',
-    'version': '0.149.2',
+    'version': '0.149.4',
     'description': 'A pure python implementation of multicast DNS service discovery',
     'long_description': 'python-zeroconf\n===============\n\n.. image:: https://github.com/python-zeroconf/python-zeroconf/workflows/CI/badge.svg\n   :target: https://github.com/python-zeroconf/python-zeroconf?query=workflow%3ACI+branch%3Amaster\n\n.. image:: https://img.shields.io/pypi/v/zeroconf.svg\n    :target: https://pypi.python.org/pypi/zeroconf\n\n.. image:: https://codecov.io/gh/python-zeroconf/python-zeroconf/branch/master/graph/badge.svg\n   :target: https://codecov.io/gh/python-zeroconf/python-zeroconf\n\n.. image:: https://img.shields.io/endpoint?url=https://codspeed.io/badge.json\n   :target: https://codspeed.io/python-zeroconf/python-zeroconf\n   :alt: Codspeed.io status for python-zeroconf\n\n.. image:: https://readthedocs.org/projects/python-zeroconf/badge/?version=latest\n    :target: https://python-zeroconf.readthedocs.io/en/latest/?badge=latest\n    :alt: Documentation Status\n\n`Documentation <https://python-zeroconf.readthedocs.io/en/latest/>`_.\n\nThis is fork of pyzeroconf, Multicast DNS Service Discovery for Python,\noriginally by Paul Scott-Murphy (https://github.com/paulsm/pyzeroconf),\nmodified by William McBrine (https://github.com/wmcbrine/pyzeroconf).\n\nThe original William McBrine\'s fork note::\n\n    This fork is used in all of my TiVo-related projects: HME for Python\n    (and therefore HME/VLC), Network Remote, Remote Proxy, and pyTivo.\n    Before this, I was tracking the changes for zeroconf.py in three\n    separate repos. I figured I should have an authoritative source.\n\n    Although I make changes based on my experience with TiVos, I expect that\n    they\'re generally applicable. This version also includes patches found\n    on the now-defunct (?) Launchpad repo of pyzeroconf, and elsewhere\n    around the net -- not always well-documented, sorry.\n\nCompatible with:\n\n* Bonjour\n* Avahi\n\nCompared to some other Zeroconf/Bonjour/Avahi Python packages, python-zeroconf:\n\n* isn\'t tied to Bonjour or Avahi\n* doesn\'t use D-Bus\n* doesn\'t force you to use particular event loop or Twisted (asyncio is used under the hood but not required)\n* is pip-installable\n* has PyPI distribution\n* has an optional cython extension for performance (pure python is supported as well)\n\nPython compatibility\n--------------------\n\n* CPython 3.10+\n* PyPy 3.10+\n\nVersioning\n----------\n\nThis project uses semantic versioning.\n\nStatus\n------\n\nThis project is actively maintained.\n\nTraffic Reduction\n-----------------\n\nBefore version 0.32, most traffic reduction techniques described in https://datatracker.ietf.org/doc/html/rfc6762#section-7\nwhere not implemented which could lead to excessive network traffic.  It is highly recommended that version 0.32 or later\nis used if this is a concern.\n\nIPv6 support\n------------\n\nIPv6 support is relatively new and currently limited, specifically:\n\n* `InterfaceChoice.All` is an alias for `InterfaceChoice.Default` on non-POSIX\n  systems.\n* Dual-stack IPv6 sockets are used, which may not be supported everywhere (some\n  BSD variants do not have them).\n* Listening on localhost (`::1`) does not work. Help with understanding why is\n  appreciated.\n\nHow to get python-zeroconf?\n===========================\n\n* PyPI page https://pypi.org/project/zeroconf/\n* GitHub project https://github.com/python-zeroconf/python-zeroconf\n\nThe easiest way to install python-zeroconf is using pip::\n\n    pip install zeroconf\n\n\n\nHow do I use it?\n================\n\nHere\'s an example of browsing for a service:\n\n.. code-block:: python\n\n    from zeroconf import ServiceBrowser, ServiceListener, Zeroconf\n\n\n    class MyListener(ServiceListener):\n\n        def update_service(self, zc: Zeroconf, type_: str, name: str) -> None:\n            print(f"Service {name} updated")\n\n        def remove_service(self, zc: Zeroconf, type_: str, name: str) -> None:\n            print(f"Service {name} removed")\n\n        def add_service(self, zc: Zeroconf, type_: str, name: str) -> None:\n            info = zc.get_service_info(type_, name)\n            print(f"Service {name} added, service info: {info}")\n\n\n    zeroconf = Zeroconf()\n    listener = MyListener()\n    browser = ServiceBrowser(zeroconf, "_http._tcp.local.", listener)\n    try:\n        input("Press enter to exit...\\n\\n")\n    finally:\n        zeroconf.close()\n\n.. note::\n\n    Discovery and service registration use *all* available network interfaces by default.\n    If you want to customize that you need to specify ``interfaces`` argument when\n    constructing ``Zeroconf`` object (see the code for details).\n\nIf you don\'t know the name of the service you need to browse for, try:\n\n.. code-block:: python\n\n    from zeroconf import ZeroconfServiceTypes\n    print(\'\\n\'.join(ZeroconfServiceTypes.find()))\n\nSee examples directory for more.\n\nChangelog\n=========\n\n`Changelog <CHANGELOG.md>`_\n\nLicense\n=======\n\nLGPL, see COPYING file for details.\n',
     'author': 'Paul Scott-Murphy',

{zeroconf-0.149.2 → zeroconf-0.149.4}/src/zeroconf/__init__.py

@@ -88,7 +88,7 @@ from ._utils.time import (  # noqa # import needed for backwards compat
 
 __author__ = "Paul Scott-Murphy, William McBrine"
 __maintainer__ = "Jakub Stasiak <jakub@stasiak.at>"
-__version__ = "0.149.2"
+__version__ = "0.149.4"
 __license__ = "LGPL"
 
 

{zeroconf-0.149.2 → zeroconf-0.149.4}/src/zeroconf/_engine.py

@@ -114,10 +114,17 @@ class AsyncEngine:
                 lambda: AsyncListener(self.zc),  # type: ignore[arg-type, return-value]
                 sock=s,
             )
+            # Register the wrapped transport before releasing the engine's
+            # handle so a concurrent shutdown always sees ``s`` in exactly
+            # one place; do not add an ``await`` between these two steps.
             self.protocols.append(cast(AsyncListener, protocol))
             self.readers.append(make_wrapped_transport(cast(asyncio.DatagramTransport, transport)))
             if s in sender_sockets:
                 self.senders.append(make_wrapped_transport(cast(asyncio.DatagramTransport, transport)))
+            if s is self._listen_socket:
+                self._listen_socket = None
+            if s in self._respond_sockets:
+                self._respond_sockets.remove(s)
 
     def _async_cache_cleanup(self) -> None:
         """Periodic cache cleanup."""
@@ -139,19 +146,37 @@ class AsyncEngine:
     async def _async_close(self) -> None:
         """Cancel and wait for the cleanup task to finish."""
         assert self._setup_task is not None
-        await self._setup_task
+        # Swallow CancelledError only if the setup task itself was
+        # cancelled (close-before-start); outer-task cancellation must
+        # propagate.
+        try:
+            await self._setup_task
+        except asyncio.CancelledError:
+            if not self._setup_task.cancelled():
+                raise
         self._async_shutdown()
         await asyncio.sleep(0)  # flush out any call soons
-        assert self._cleanup_timer is not None
-        self._cleanup_timer.cancel()
+        if self._cleanup_timer is not None:
+            self._cleanup_timer.cancel()
 
     def _async_shutdown(self) -> None:
-        """Shutdown transports and sockets."""
+        """Shutdown transports and sockets; safe to call repeatedly."""
         assert self.running_future is not None
         assert self.loop is not None
         self.running_future = self.loop.create_future()
+        # Cancel pending setup so it can't wrap fresh transports after
+        # shutdown has started.
+        if self._setup_task is not None and not self._setup_task.done():
+            self._setup_task.cancel()
         for wrapped_transport in itertools.chain(self.senders, self.readers):
             wrapped_transport.transport.close()
+        # Anything still here was never adopted by a transport.
+        if self._listen_socket is not None:
+            self._listen_socket.close()
+            self._listen_socket = None
+        for s in self._respond_sockets:
+            s.close()
+        self._respond_sockets = []
 
     def close(self) -> None:
         """Close from sync context.

{zeroconf-0.149.2 → zeroconf-0.149.4}/tests/__init__.py

@@ -91,6 +91,23 @@ def _clear_cache(zc: Zeroconf) -> None:
     zc.question_history.clear()
 
 
+def _backdate_cache(zc: Zeroconf, ms: int = 1100) -> None:
+    """Backdate every cached record's `created` time by `ms` milliseconds.
+
+    rfc6762#section-10.2 keys off "received more than one second ago", so
+    backdating is equivalent to sleeping `ms` in real time without the
+    wall-clock wait.
+
+    Iterate `store.values()`, not the dict directly — when a record is
+    re-added with an equal hash, the key stays the original object while
+    the value is replaced with the latest; mutating the key would update
+    stale objects no one reads.
+    """
+    for store in zc.cache.cache.values():
+        for record in store.values():
+            record.created -= ms
+
+
 def time_changed_millis(millis: float | None = None) -> None:
     """Call all scheduled events for a time."""
     loop = asyncio.get_running_loop()

{zeroconf-0.149.2 → zeroconf-0.149.4}/tests/services/test_browser.py

@@ -331,7 +331,9 @@ class TestServiceBrowser(unittest.TestCase):
             service_updated_event.clear()
             service_text = b"path=/~matt2/"
             _inject_response(zeroconf, mock_record_update_incoming_msg(r.ServiceStateChange.Updated))
-            service_updated_event.wait(wait_time)
+            # Negative assertion: a duplicate update must NOT fire the listener. The wait
+            # always times out, so keep the budget short rather than reusing wait_time.
+            service_updated_event.wait(0.3)
             assert service_added_count == 1
             assert service_updated_count == 2
             assert service_removed_count == 0
@@ -554,7 +556,7 @@ def test_first_query_delay():
 
 
 @pytest.mark.asyncio
-async def test_asking_default_is_asking_qm_questions_after_the_first_qu():
+async def test_asking_default_is_asking_qm_questions_after_the_first_qu(quick_timing: None) -> None:
     """Verify the service browser's first questions are QU and refresh queries are QM."""
     service_added = asyncio.Event()
     service_removed = asyncio.Event()
@@ -656,7 +658,7 @@ async def test_asking_default_is_asking_qm_questions_after_the_first_qu():
 
 
 @pytest.mark.asyncio
-async def test_ttl_refresh_cancelled_rescue_query():
+async def test_ttl_refresh_cancelled_rescue_query(quick_timing: None) -> None:
     """Verify seeing a name again cancels the rescue query."""
     service_added = asyncio.Event()
     service_removed = asyncio.Event()
@@ -844,7 +846,7 @@ async def test_asking_qu_questions():
             await aiozc.async_close()
 
 
-def test_legacy_record_update_listener():
+def test_legacy_record_update_listener(quick_timing: None) -> None:
     """Test a RecordUpdateListener that does not implement update_records."""
 
     # instantiate a zeroconf instance
@@ -1031,7 +1033,7 @@ def test_service_browser_listeners_update_service():
 
 
 def test_service_browser_listeners_no_update_service():
-    """Test that the ServiceBrowser ServiceListener that does not implement update_service."""
+    """A listener that ignores update events records only add/remove callbacks."""
 
     # instantiate a zeroconf instance
     zc = Zeroconf(interfaces=["127.0.0.1"])
@@ -1049,6 +1051,9 @@ def test_service_browser_listeners_no_update_service():
             if name == registration_name:
                 callbacks.append(("remove", type_, name))
 
+        def update_service(self, zc, type_, name) -> None:  # type: ignore[no-untyped-def]
+            pass
+
     listener = MyServiceListener()
 
     browser = r.ServiceBrowser(zc, type_, None, listener)
@@ -1497,10 +1502,15 @@ def test_service_browser_expire_callbacks():
     # Force the ttl to be 1 second
     now = current_time_millis()
     for cache_record in list(zc.cache.cache.values()):
-        for record in cache_record:
+        for record in cache_record.values():
             zc.cache._async_set_created_ttl(record, now, 1)
 
-    time.sleep(0.3)
+    # Wait for the add callback to fire from the original inject_response.
+    for _ in range(30):
+        time.sleep(0.01)
+        if len(callbacks) == 1:
+            break
+
     info.port = 400
     info._dns_service_cache = None  # we are mutating the record so clear the cache
 
@@ -1509,8 +1519,8 @@ def test_service_browser_expire_callbacks():
         mock_incoming_msg([info.dns_service()]),
     )
 
-    for _ in range(10):
-        time.sleep(0.05)
+    for _ in range(30):
+        time.sleep(0.01)
         if len(callbacks) == 2:
             break
 
@@ -1519,8 +1529,19 @@ def test_service_browser_expire_callbacks():
         ("update", type_, registration_name),
     ]
 
-    for _ in range(25):
-        time.sleep(0.05)
+    # Re-add every cached record with `created` in the past so the
+    # next reaper tick (0.01s) expires them and fires the remove
+    # callback, instead of waiting the full TTL in real time.
+    # Going through `_async_set_created_ttl` updates the expiration
+    # heap; mutating `record.created` directly would leave the heap
+    # entry pointing at the original `when` so the reaper never wakes.
+    past = current_time_millis() - 2000
+    for cache_record in list(zc.cache.cache.values()):
+        for record in list(cache_record.values()):
+            zc.cache._async_set_created_ttl(record, past, 1)
+
+    for _ in range(30):
+        time.sleep(0.01)
         if len(callbacks) == 3:
             break
 
@@ -1565,7 +1586,7 @@ def test_scheduled_ptr_query_dunder_methods():
 
 
 @pytest.mark.asyncio
-async def test_close_zeroconf_without_browser_before_start_up_queries():
+async def test_close_zeroconf_without_browser_before_start_up_queries(quick_timing: None) -> None:
     """Test that we stop sending startup queries if zeroconf is closed out from under the browser."""
     service_added = asyncio.Event()
     type_ = "_http._tcp.local."
@@ -1632,7 +1653,7 @@ async def test_close_zeroconf_without_browser_before_start_up_queries():
 
 
 @pytest.mark.asyncio
-async def test_close_zeroconf_without_browser_after_start_up_queries():
+async def test_close_zeroconf_without_browser_after_start_up_queries(quick_timing: None) -> None:
     """Test that we stop sending rescue queries if zeroconf is closed out from under the browser."""
     service_added = asyncio.Event()
 

{zeroconf-0.149.2 → zeroconf-0.149.4}/tests/services/test_info.py

@@ -436,12 +436,29 @@ class TestServiceInfo(unittest.TestCase):
                 service_info_event.set()
 
             try:
+                # Seed TXT/A/AAAA with a far-future `than` before the
+                # helper thread starts. The first (QU) query bypasses
+                # suppression so phase 1 still observes 4 questions; the
+                # second (QM) query fires ~220-320ms after the first, too
+                # tight a window to seed reliably from the test thread on
+                # slow runners. async_expire only removes entries where
+                # now - than > _DUPLICATE_QUESTION_INTERVAL, so future-
+                # dated entries persist for the duration of the test.
+                seed_history_questions = (
+                    r.DNSQuestion(service_name, const._TYPE_A, const._CLASS_IN),
+                    r.DNSQuestion(service_name, const._TYPE_AAAA, const._CLASS_IN),
+                    r.DNSQuestion(service_name, const._TYPE_TXT, const._CLASS_IN),
+                )
+                far_future = r.current_time_millis() + 60_000
+                for question in seed_history_questions:
+                    zc.question_history.add_question_at_time(question, far_future, set())
+
                 helper_thread = threading.Thread(
                     target=get_service_info_helper,
                     args=(zc, service_type, service_name),
                 )
                 helper_thread.start()
-                wait_time = (const._LISTENER_TIME + info._AVOID_SYNC_DELAY_RANDOM_INTERVAL[1] + 5) / 1000
+                wait_time = (const._LISTENER_TIME + info._AVOID_SYNC_DELAY_RANDOM_INTERVAL[1] + 500) / 1000
 
                 # Expect query for SRV, TXT, A, AAAA
                 send_event.wait(wait_time)
@@ -457,64 +474,29 @@ class TestServiceInfo(unittest.TestCase):
                 # by the question history
                 last_sent = None
                 send_event.clear()
-                for _ in range(3):
-                    send_event.wait(
-                        wait_time * 0.25
-                    )  # Wait long enough to be inside the question history window
-                    now = r.current_time_millis()
-                    zc.question_history.add_question_at_time(
-                        r.DNSQuestion(service_name, const._TYPE_A, const._CLASS_IN),
-                        now,
-                        set(),
-                    )
-                    zc.question_history.add_question_at_time(
-                        r.DNSQuestion(service_name, const._TYPE_AAAA, const._CLASS_IN),
-                        now,
-                        set(),
-                    )
-                    zc.question_history.add_question_at_time(
-                        r.DNSQuestion(service_name, const._TYPE_TXT, const._CLASS_IN),
-                        now,
-                        set(),
-                    )
-                send_event.wait(wait_time * 0.25)
+                send_event.wait(wait_time)
                 assert last_sent is not None
                 assert len(last_sent.questions) == 1  # type: ignore[unreachable]
                 assert r.DNSQuestion(service_name, const._TYPE_SRV, const._CLASS_IN) in last_sent.questions
                 assert service_info is None
 
+                # Future-date SRV too: the SRV entry added by the previous
+                # QM query has `than = now`, so it expires after
+                # _DUPLICATE_QUESTION_INTERVAL — before the next scheduled
+                # QM query (~1s + jitter later).
+                zc.question_history.add_question_at_time(
+                    r.DNSQuestion(service_name, const._TYPE_SRV, const._CLASS_IN),
+                    r.current_time_millis() + 60_000,
+                    set(),
+                )
+
                 wait_time = (
-                    const._DUPLICATE_QUESTION_INTERVAL + info._AVOID_SYNC_DELAY_RANDOM_INTERVAL[1] + 5
+                    const._DUPLICATE_QUESTION_INTERVAL + info._AVOID_SYNC_DELAY_RANDOM_INTERVAL[1] + 500
                 ) / 1000
                 # Expect no queries as all are suppressed by the question history
                 last_sent = None
                 send_event.clear()
-                for _ in range(3):
-                    send_event.wait(
-                        wait_time * 0.25
-                    )  # Wait long enough to be inside the question history window
-                    now = r.current_time_millis()
-                    zc.question_history.add_question_at_time(
-                        r.DNSQuestion(service_name, const._TYPE_A, const._CLASS_IN),
-                        now,
-                        set(),
-                    )
-                    zc.question_history.add_question_at_time(
-                        r.DNSQuestion(service_name, const._TYPE_AAAA, const._CLASS_IN),
-                        now,
-                        set(),
-                    )
-                    zc.question_history.add_question_at_time(
-                        r.DNSQuestion(service_name, const._TYPE_TXT, const._CLASS_IN),
-                        now,
-                        set(),
-                    )
-                    zc.question_history.add_question_at_time(
-                        r.DNSQuestion(service_name, const._TYPE_SRV, const._CLASS_IN),
-                        now,
-                        set(),
-                    )
-                send_event.wait(wait_time * 0.25)
+                send_event.wait(wait_time)
                 # All questions are suppressed so no query should be sent
                 assert last_sent is None
                 assert service_info is None
@@ -1547,6 +1529,7 @@ async def test_bad_ip_addresses_ignored_in_cache():
     info = ServiceInfo(type_, registration_name)
     info.load_from_cache(aiozc.zeroconf)
     assert info.addresses_by_version(IPVersion.V4Only) == [b"\x7f\x00\x00\x01"]
+    await aiozc.async_close()
 
 
 @pytest.mark.asyncio
@@ -1822,6 +1805,7 @@ async def test_address_resolver():
     aiozc.zeroconf.async_send(outgoing)
     assert await resolve_task
     assert resolver.addresses == [b"\x7f\x00\x00\x01"]
+    await aiozc.async_close()
 
 
 @pytest.mark.asyncio
@@ -1846,6 +1830,7 @@ async def test_address_resolver_ipv4():
     aiozc.zeroconf.async_send(outgoing)
     assert await resolve_task
     assert resolver.addresses == [b"\x7f\x00\x00\x01"]
+    await aiozc.async_close()
 
 
 @pytest.mark.asyncio
@@ -1872,6 +1857,7 @@ async def test_address_resolver_ipv6():
     aiozc.zeroconf.async_send(outgoing)
     assert await resolve_task
     assert resolver.ip_addresses_by_version(IPVersion.All) == [ip_address("fe80::52e:c2f2:bc5f:e9c6")]
+    await aiozc.async_close()
 
 
 @pytest.mark.asyncio

{zeroconf-0.149.2 → zeroconf-0.149.4}/tests/services/test_types.py

@@ -47,10 +47,10 @@ def test_integration_with_listener(disable_duplicate_packet_suppression):
     )
     zeroconf_registrar.registry.async_add(info)
     try:
-        service_types = ZeroconfServiceTypes.find(interfaces=["127.0.0.1"], timeout=2)
+        service_types = ZeroconfServiceTypes.find(interfaces=["127.0.0.1"], timeout=0.5)
         assert type_ in service_types
         _clear_cache(zeroconf_registrar)
-        service_types = ZeroconfServiceTypes.find(zc=zeroconf_registrar, timeout=2)
+        service_types = ZeroconfServiceTypes.find(zc=zeroconf_registrar, timeout=0.5)
         assert type_ in service_types
 
     finally:
@@ -79,10 +79,10 @@ def test_integration_with_listener_v6_records(disable_duplicate_packet_suppressi
     )
     zeroconf_registrar.registry.async_add(info)
     try:
-        service_types = ZeroconfServiceTypes.find(interfaces=["127.0.0.1"], timeout=2)
+        service_types = ZeroconfServiceTypes.find(interfaces=["127.0.0.1"], timeout=0.5)
         assert type_ in service_types
         _clear_cache(zeroconf_registrar)
-        service_types = ZeroconfServiceTypes.find(zc=zeroconf_registrar, timeout=2)
+        service_types = ZeroconfServiceTypes.find(zc=zeroconf_registrar, timeout=0.5)
         assert type_ in service_types
 
     finally:
@@ -115,10 +115,10 @@ def test_integration_with_listener_ipv6(disable_duplicate_packet_suppression):
     )
     zeroconf_registrar.registry.async_add(info)
     try:
-        service_types = ZeroconfServiceTypes.find(ip_version=r.IPVersion.V6Only, timeout=2)
+        service_types = ZeroconfServiceTypes.find(ip_version=r.IPVersion.V6Only, timeout=0.5)
         assert type_ in service_types
         _clear_cache(zeroconf_registrar)
-        service_types = ZeroconfServiceTypes.find(zc=zeroconf_registrar, timeout=2)
+        service_types = ZeroconfServiceTypes.find(zc=zeroconf_registrar, timeout=0.5)
         assert type_ in service_types
 
     finally:
@@ -147,10 +147,10 @@ def test_integration_with_subtype_and_listener(disable_duplicate_packet_suppress
     )
     zeroconf_registrar.registry.async_add(info)
     try:
-        service_types = ZeroconfServiceTypes.find(interfaces=["127.0.0.1"], timeout=2)
+        service_types = ZeroconfServiceTypes.find(interfaces=["127.0.0.1"], timeout=0.5)
         assert discovery_type in service_types
         _clear_cache(zeroconf_registrar)
-        service_types = ZeroconfServiceTypes.find(zc=zeroconf_registrar, timeout=2)
+        service_types = ZeroconfServiceTypes.find(zc=zeroconf_registrar, timeout=0.5)
         assert discovery_type in service_types
 
     finally:

{zeroconf-0.149.2 → zeroconf-0.149.4}/tests/test_asyncio.py

@@ -126,7 +126,7 @@ async def test_sync_within_event_loop_executor() -> None:
 
 
 @pytest.mark.asyncio
-async def test_async_service_registration() -> None:
+async def test_async_service_registration(quick_timing: None) -> None:
     """Test registering services broadcasts the registration by default."""
     aiozc = AsyncZeroconf(interfaces=["127.0.0.1"])
     type_ = "_test1-srvc-type._tcp.local."
@@ -193,7 +193,7 @@ async def test_async_service_registration() -> None:
 
 
 @pytest.mark.asyncio
-async def test_async_service_registration_with_server_missing() -> None:
+async def test_async_service_registration_with_server_missing(quick_timing: None) -> None:
     """Test registering a service with the server not specified.
 
     For backwards compatibility, the server should be set to the
@@ -394,7 +394,7 @@ async def test_async_service_registration_same_server_same_ports(quick_timing: N
 
 
 @pytest.mark.asyncio
-async def test_async_service_registration_name_conflict() -> None:
+async def test_async_service_registration_name_conflict(quick_timing: None) -> None:
     """Test registering services throws on name conflict."""
     aiozc = AsyncZeroconf(interfaces=["127.0.0.1"])
     type_ = "_test-srvc2-type._tcp.local."
@@ -500,10 +500,11 @@ async def test_async_service_registration_name_strict_check(quick_timing: None)
 
     await aiozc.async_unregister_service(info)
     await aiozc.async_close()
+    zc.close()
 
 
 @pytest.mark.asyncio
-async def test_async_tasks() -> None:
+async def test_async_tasks(quick_timing: None) -> None:
     """Test awaiting broadcast tasks"""
 
     aiozc = AsyncZeroconf(interfaces=["127.0.0.1"])
@@ -569,7 +570,7 @@ async def test_async_tasks() -> None:
 
 
 @pytest.mark.asyncio
-async def test_async_wait_unblocks_on_update() -> None:
+async def test_async_wait_unblocks_on_update(quick_timing: None) -> None:
     """Test async_wait will unblock on update."""
 
     aiozc = AsyncZeroconf(interfaces=["127.0.0.1"])
@@ -605,7 +606,7 @@ async def test_async_wait_unblocks_on_update() -> None:
 
 
 @pytest.mark.asyncio
-async def test_service_info_async_request() -> None:
+async def test_service_info_async_request(quick_timing: None) -> None:
     """Test registering services broadcasts and query with AsyncServceInfo.async_request."""
     if not has_working_ipv6() or os.environ.get("SKIP_IPV6"):
         pytest.skip("Requires IPv6")
@@ -695,26 +696,41 @@ async def test_service_info_async_request() -> None:
     assert aiosinfos[1] is not None
     assert aiosinfos[1].addresses == [socket.inet_aton("10.0.1.5")]
 
+    # Drop pending multicast responses queued under the original
+    # `info` / `info2` registrations. Their snapshots predate the
+    # `async_update_service` swap, so if they flushed after
+    # `_clear_cache` below they would poison `aiosinfo.server`
+    # with `ash-1.local.` and the `_is_complete=False` loop would
+    # then keep asking for an A record nobody answers. The pending
+    # `loop.call_at` for each queue fires harmlessly on the empty
+    # deque.
+    aiozc.zeroconf.out_queue.queue.clear()
+    aiozc.zeroconf.out_delay_queue.queue.clear()
     aiosinfo = AsyncServiceInfo(type_, registration_name)
     _clear_cache(aiozc.zeroconf)
     # Generating the race condition is almost impossible
-    # without patching since its a TOCTOU race
+    # without patching since its a TOCTOU race. 1500ms covers
+    # the initial _LISTENER_TIME + random delay (200-320ms) and
+    # leaves plenty of margin for the loopback response to land
+    # before the loop times out.
     with patch("zeroconf.asyncio.AsyncServiceInfo._is_complete", False):
-        await aiosinfo.async_request(aiozc.zeroconf, 3000)
+        await aiosinfo.async_request(aiozc.zeroconf, 1500)
     assert aiosinfo is not None
     assert aiosinfo.addresses == [socket.inet_aton("10.0.1.3")]
 
     task = await aiozc.async_unregister_service(new_info)
     await task
 
-    aiosinfo = await aiozc.async_get_service_info(type_, registration_name)
+    # Cap timeout: the service is gone, so this is expected to return None;
+    # waiting the default 3000ms is pure overhead.
+    aiosinfo = await aiozc.async_get_service_info(type_, registration_name, timeout=200)
     assert aiosinfo is None
 
     await aiozc.async_close()
 
 
 @pytest.mark.asyncio
-async def test_async_service_browser() -> None:
+async def test_async_service_browser(quick_timing: None) -> None:
     """Test AsyncServiceBrowser."""
     aiozc = AsyncZeroconf(interfaces=["127.0.0.1"])
     type_ = "_test9-srvc-type._tcp.local."
@@ -774,7 +790,7 @@ async def test_async_service_browser() -> None:
 
 
 @pytest.mark.asyncio
-async def test_async_context_manager() -> None:
+async def test_async_context_manager(quick_timing: None) -> None:
     """Test using an async context manager."""
     type_ = "_test10-sr-type._tcp.local."
     name = "xxxyyy"
@@ -906,10 +922,10 @@ async def test_async_zeroconf_service_types(quick_timing: None) -> None:
     await asyncio.sleep(0.2)
     _clear_cache(zeroconf_registrar.zeroconf)
     try:
-        service_types = await AsyncZeroconfServiceTypes.async_find(interfaces=["127.0.0.1"], timeout=2)
+        service_types = await AsyncZeroconfServiceTypes.async_find(interfaces=["127.0.0.1"], timeout=0.5)
         assert type_ in service_types
         _clear_cache(zeroconf_registrar.zeroconf)
-        service_types = await AsyncZeroconfServiceTypes.async_find(aiozc=zeroconf_registrar, timeout=2)
+        service_types = await AsyncZeroconfServiceTypes.async_find(aiozc=zeroconf_registrar, timeout=0.5)
         assert type_ in service_types
 
     finally:
@@ -974,7 +990,7 @@ async def test_service_browser_instantiation_generates_add_events_from_cache():
 
 
 @pytest.mark.asyncio
-async def test_integration():
+async def test_integration(quick_timing: None) -> None:
     service_added = asyncio.Event()
     service_removed = asyncio.Event()
     unexpected_ttl = asyncio.Event()
@@ -1166,9 +1182,11 @@ async def test_info_asking_default_is_asking_qm_questions_after_the_first_qu():
     # patch the zeroconf send
     with patch.object(zeroconf_info, "async_send", send):
         aiosinfo = AsyncServiceInfo(type_, registration_name)
-        # Patch _is_complete so we send multiple times
+        # Patch _is_complete so we send multiple times. 500ms covers
+        # the QU query at 0ms plus the QM query at ~_LISTENER_TIME +
+        # max random delay (~320ms).
         with patch("zeroconf.asyncio.AsyncServiceInfo._is_complete", False):
-            await aiosinfo.async_request(aiozc.zeroconf, 1200)
+            await aiosinfo.async_request(aiozc.zeroconf, 500)
         try:
             assert first_outgoing.questions[0].unicast is True  # type: ignore[union-attr]
             assert second_outgoing.questions[0].unicast is False  # type: ignore[attr-defined]