morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 00:14:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

Try to make TEST-75-RESOLVED less flaky (#39733)

Browse Source 
These tests unfortunately rely on polling in several areas. In some
cases, it appears the timeouts are too short (e.g. #39602, or
https://github.com/systemd/systemd/actions/runs/19369869943/job/55422626427?pr=39731#logs).

Try to adjust the timeouts to see if this makes things more reliable.
This commit is contained in:
Luca Boccassi
2025-11-14 21:27:24 +00:00
committed by GitHub
parent 384e88a238 40a6069f9a
commit 2e939baaf3
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/units/TEST-75-RESOLVED.sh
View File

@@ -185,7 +185,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
@@ -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.