From e2fbcee030ca13db252105b00b89af13591e4465 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Sun, 7 Dec 2025 00:43:47 +0000 Subject: [PATCH] test-network: fix invalid captive portal URL with dnsmasq 2.92 (#40011) dnsmasq 2.92 started converting binary content to ascii so the previous invalid URL is no longer invalid as it's escaped. So the test started failing: https://bugs.debian.org/1122015 Use a '|' character instead, which is not a valid URL character but it's also not escaped by dnsmasq. Follow-up for 1219391c9fa74568e4c60ee6b495e74887ab448f --- test/test-network/systemd-networkd-tests.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index beaefbdc895..67d7ccbb622 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -8630,8 +8630,8 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities): start_networkd() self.wait_online('veth-peer:carrier') masq = lambda bs: ':'.join(f'{b:02x}' for b in bs) - start_dnsmasq('--dhcp-option=114,' + masq(b'http://\x00invalid/url'), - '--dhcp-option=option6:103,' + masq(b'http://\x00/invalid/url')) + start_dnsmasq('--dhcp-option=114,http://|invalid/url', + '--dhcp-option=option6:103,http://|invalid/url') check(self, True, True) check(self, True, False) -- 2.47.3