From: Nick Rosbrook Date: Fri, 14 Nov 2025 19:13:07 +0000 (-0500) Subject: test: adjust timeouts for testcase_15_wait_online_dns X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=40a6069f9a390254abbf69acebe9ef7f24d2af3e;p=thirdparty%2Fsystemd.git test: adjust timeouts for testcase_15_wait_online_dns Do not set a timeout on the wait-online call, since there are timeout calls later that will prevent the test from blocking forever. Increase those timeout calls for slower CI runs. --- diff --git a/test/units/TEST-75-RESOLVED.sh b/test/units/TEST-75-RESOLVED.sh index 0fa7e6ac720..232180ccf32 100755 --- a/test/units/TEST-75-RESOLVED.sh +++ b/test/units/TEST-75-RESOLVED.sh @@ -1451,10 +1451,10 @@ testcase_15_wait_online_dns() { # Begin systemd-networkd-wait-online --dns systemd-run -u "$unit" -p "Environment=SYSTEMD_LOG_LEVEL=debug" -p "Environment=SYSTEMD_LOG_TARGET=journal" --service-type=exec \ - /usr/lib/systemd/systemd-networkd-wait-online --timeout=20 --dns --interface=dns0 + /usr/lib/systemd/systemd-networkd-wait-online --timeout=0 --dns --interface=dns0 # Wait until it blocks waiting for updated DNS config - timeout 10 bash -c "journalctl -b -u $unit -f | grep -q -m1 'dns0: No.*DNS server is accessible'" + timeout 30 bash -c "journalctl -b -u $unit -f | grep -q -m1 'dns0: No.*DNS server is accessible'" # Update the global configuration. Restart rather than reload systemd-resolved so that # systemd-networkd-wait-online has to re-connect to the varlink service. @@ -1465,7 +1465,7 @@ testcase_15_wait_online_dns() { systemctl restart systemd-resolved.service # Wait for the monitor to exit gracefully. - timeout 10 bash -c "while systemctl --quiet is-active $unit; do sleep 0.5; done" + timeout 30 bash -c "while systemctl --quiet is-active $unit; do sleep 0.5; done" journalctl --sync # Check that a disconnect happened, and was handled.