From bc52858a67c42651efba48b75475aafce4964f65 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Wed, 11 Feb 2015 16:53:39 +1100
Subject: [PATCH] 4061.   [bug]           Handle timeout in legacy system test.
 [RT #38573]

(cherry picked from commit 2ff2145ff53ec10df0e3c9c51906d63187fd54fa)
---
 CHANGES                          | 2 ++
 bin/tests/system/legacy/tests.sh | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 808ed300f0..032056e625 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
 	--- 9.10.2rc2 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 1e26edf19a..92a830db1b 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