From 721e78ff7315739e9083913fc13c0864acb80213 Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Tue, 9 Apr 2024 20:15:36 +0200 Subject: [PATCH] test: give sd-resolved enough time to timeout The timeout on sd-resolved's side is 5-10s (UDP or TCP), but dig's default timeout is 5s. Let's give sd-resolved enough time to timeout before either giving up or checking if it served stale data on dig's side. Resolves: #31639 --- test/units/testsuite-75.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/test/units/testsuite-75.sh b/test/units/testsuite-75.sh index 199a23964d1..fc29e642fb0 100755 --- a/test/units/testsuite-75.sh +++ b/test/units/testsuite-75.sh @@ -719,7 +719,9 @@ if command -v nft >/dev/null; then sleep 2 drop_dns_outbound_traffic set +e - run dig stale1.unsigned.test -t A + # Make sure we give sd-resolved enough time to timeout (5-10s) before giving up + # See: https://github.com/systemd/systemd/issues/31639#issuecomment-2009152617 + run dig +tries=1 +timeout=15 stale1.unsigned.test -t A set -eux grep -qE "no servers could be reached" "$RUN_OUT" nft flush ruleset @@ -738,7 +740,8 @@ if command -v nft >/dev/null; then grep -qE "NOERROR" "$RUN_OUT" sleep 2 drop_dns_outbound_traffic - run dig stale1.unsigned.test -t A + # Make sure we give sd-resolved enough time to timeout (5-10s) and serve the stale data (see above) + run dig +tries=1 +timeout=15 stale1.unsigned.test -t A grep -qE "NOERROR" "$RUN_OUT" grep -qE "10.0.0.112" "$RUN_OUT" -- 2.47.3