4061. [bug] Handle timeout in legacy system test. [RT #38573]

(cherry picked from commit 2ff2145ff53ec10df0e3c9c51906d63187fd54fa)

diff --git a/CHANGES b/CHANGES
index e0e8feb0bbce9f7c24bc13142691040dfe8e9038..5db7ccee0f5ab892a2a3bc5fca0751116551e883 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
+
        --- 9.9.7rc2 released ---
 
+4061.  [bug]           Handle timeout in legacy system test. [RT #38573]
+
 4060.  [bug]           dns_rdata_freestruct could be call on a uninitialised
                        structure when handling a error. [RT #38568]
 

diff --git a/bin/tests/system/legacy/tests.sh b/bin/tests/system/legacy/tests.sh
index 1e26edf19ac0695c5abd66a7fd4414dd92444118..92a830db1bfe156c38f4e7038aabb63d4a2f46b3 100755 (executable)
--- a/bin/tests/system/legacy/tests.sh
+++ b/bin/tests/system/legacy/tests.sh
@@ -159,7 +159,8 @@ then
     echo "I:checking recursive lookup to edns 512 + no tcp + trust anchor fails ($n)"
     ret=0
     $DIG +tcp  @10.53.0.1 -p 5300 edns512-notcp soa > dig.out.test$n || ret=1
-    grep "status: SERVFAIL" dig.out.test$n > /dev/null || ret=1
+    grep "status: SERVFAIL" dig.out.test$n > /dev/null ||
+        grep "connection timed out;" dig.out.test$n > /dev/null || ret=1
     if [ $ret != 0 ]; then echo "I:failed"; fi
     status=`expr $status + $ret`
 else