test: cover scope_id ipv6 dedupe partial branches

bdraco · bdraco · commit 60708f967c37 · 2026-05-20T15:07:02.000-05:00
Add a cache LIFO case where a scoped AAAA is encountered before its
unscoped twin so the unscoped variant fails the _has_more_scope_info
check and the scoped entry stays in place. Add a direct call against
_has_more_scope_info with an IPv4 address so its non-IPv6 short-circuit
return is exercised.
diff --git a/tests/services/test_info.py b/tests/services/test_info.py
@@ -18,7 +18,8 @@
 from zeroconf import DNSAddress, RecordUpdate, const
 from zeroconf._protocol.outgoing import DNSOutgoing
 from zeroconf._services import info
-from zeroconf._services.info import ServiceInfo
+from zeroconf._services.info import ServiceInfo, _has_more_scope_info
+from zeroconf._utils.ipaddress import ZeroconfIPv4Address
 from zeroconf._utils.net import IPVersion
 from zeroconf.asyncio import AsyncZeroconf
 
@@ -877,6 +878,65 @@ async def test_scoped_address_replaces_unscoped_in_live_update():
     await aiozc.async_close()
 
 
+def test_scoped_address_kept_when_unscoped_arrives_after_in_cache():
+    """Scoped AAAA seen first in iteration keeps its scope when an unscoped duplicate follows."""
+    type_ = "_http._tcp.local."
+    registration_name = f"scoped-after.{type_}"
+    zeroconf = r.Zeroconf(interfaces=["127.0.0.1"])
+    host = "scoped-after.local."
+    packed = socket.inet_pton(socket.AF_INET6, "fe80::52e:c2f2:bc5f:e9c6")
+
+    zeroconf.cache.async_add_records(
+        [
+            r.DNSPointer(
+                type_,
+                const._TYPE_PTR,
+                const._CLASS_IN | const._CLASS_UNIQUE,
+                120,
+                registration_name,
+            ),
+            r.DNSService(
+                registration_name,
+                const._TYPE_SRV,
+                const._CLASS_IN | const._CLASS_UNIQUE,
+                120,
+                0,
+                0,
+                80,
+                host,
+            ),
+            r.DNSAddress(
+                host,
+                const._TYPE_AAAA,
+                const._CLASS_IN | const._CLASS_UNIQUE,
+                120,
+                packed,
+                scope_id=5,
+            ),
+            r.DNSAddress(
+                host,
+                const._TYPE_AAAA,
+                const._CLASS_IN | const._CLASS_UNIQUE,
+                120,
+                packed,
+                scope_id=None,
+            ),
+        ]
+    )
+
+    info = ServiceInfo(type_, registration_name)
+    info.load_from_cache(zeroconf)
+    assert info.parsed_scoped_addresses() == ["fe80::52e:c2f2:bc5f:e9c6%5"]
+    assert info.ip_addresses_by_version(r.IPVersion.V6Only) == [ip_address("fe80::52e:c2f2:bc5f:e9c6%5")]
+    zeroconf.close()
+
+
+def test_has_more_scope_info_returns_false_for_ipv4():
+    """The scope_id helper short-circuits for IPv4 since A records carry no scope."""
+    ip4 = ZeroconfIPv4Address("192.0.2.1")
+    assert _has_more_scope_info(ip4, ip4) is False
+
+
 # This test uses asyncio because it needs to access the cache directly
 # which is not threadsafe
 @pytest.mark.asyncio
