1
0
mirror of https://github.com/systemd/systemd synced 2026-03-26 08:44:55 +01:00

Compare commits

..

3 Commits

Author SHA1 Message Date
Nick Rosbrook
00a942ea5e 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.

(cherry picked from commit 40a6069f9a390254abbf69acebe9ef7f24d2af3e)
2025-12-06 01:58:11 +09:00
Nick Rosbrook
cb9046cf2e test: increase timeout waiting for zone DS records setup
This test is flaky on the infrastructure due to this setup step timing
out. As a naive step, just increase the timeout to 60s.

Part 1 of #39602

(cherry picked from commit be394fcaffbf103125c116dca8d296243a7e29d9)
2025-12-06 01:58:11 +09:00
Nick Rosbrook
9d3dc0cc95 test: wait for interface to come online before checking DNS scopes
The current test is flaky because it creates a new interface definition,
calls networkctl reload, and then calls resolvectl show-cache. If
resolved has not received the changes and setup the DNS scopes for the
interface, show-cache will be empty for that interface.

Part 2 of #39602

(cherry picked from commit 3d6eb1ed420c17aef877157b41a1735cc2c0b150)
2025-12-06 01:58:11 +09:00

View File

@ -186,7 +186,7 @@ EOF
fi
systemctl start knot
# Wait for signed.test's zone DS records to get pushed to the parent zone
timeout 30s bash -xec 'until knotc zone-read test. signed.test. ds | grep -E "signed\.test\. [0-9]+ DS"; do sleep 2; done'
timeout 60s bash -xec 'until knotc zone-read test. signed.test. ds | grep -E "signed\.test\. [0-9]+ DS"; do sleep 2; done'
systemctl status resolved-dummy-server
networkctl status
@ -829,6 +829,7 @@ testcase_09_resolvectl_showcache() {
} > /run/systemd/network/10-dns2.network
networkctl reload
networkctl reconfigure dns2
/usr/lib/systemd/systemd-networkd-wait-online --timeout=60 --dns --interface=dns2
mkdir -p /run/systemd/resolved.conf.d/
{
@ -1377,10 +1378,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.
@ -1391,7 +1392,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.