From: Mark Andrews <marka@isc.org>
Date: Wed, 11 Feb 2015 05:53:39 +0000 (+1100)
Subject: 4061.   [bug]           Handle timeout in legacy system test. [RT #38573]
X-Git-Tag: v9.11.0a1~1016
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=2ff2145ff53ec10df0e3c9c51906d63187fd54fa;p=thirdparty%2Fbind9.git

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

diff --git a/CHANGES b/CHANGES
index 771b0229fca..c853e5af0b5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+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 1e26edf19ac..92a830db1bf 100755
--- 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