From: W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Date: Fri, 31 Jul 2020 07:32:19 +0000 (+0200)
Subject: stream reuse, move drop in tcp_reuse test to timeout section of test.
X-Git-Tag: release-1.13.0rc1~5^2~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d684bee4b0a84cd0ec9070a7dcbfa0d21c9f87a4;p=thirdparty%2Funbound.git

stream reuse, move drop in tcp_reuse test to timeout section of test.
---

diff --git a/testdata/tcp_reuse.tdir/tcp_reuse.test b/testdata/tcp_reuse.tdir/tcp_reuse.test
index 5f0844890..e98afe0e6 100644
--- a/testdata/tcp_reuse.tdir/tcp_reuse.test
+++ b/testdata/tcp_reuse.tdir/tcp_reuse.test
@@ -61,30 +61,6 @@ else
 	exit 1
 fi
 
-echo "> query drop.net."
-$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT drop.net. A IN >outfile 2>&1
-cat outfile
-if test "$?" -ne 0; then
-	echo "exit status not OK"
-	echo "> cat logfiles"
-	cat outfile
-	cat unbound2.log
-	cat unbound.log
-	echo "Not OK"
-	exit 1
-fi
-if grep "rcode: SERVFAIL" outfile; then
-	echo "content OK"
-else
-	echo "result contents not OK, for drop.net"
-	echo "> cat logfiles"
-	cat outfile
-	cat unbound2.log
-	cat unbound.log
-	echo "result contents not OK, for drop.net"
-	exit 1
-fi
-
 echo "> query refuse.net."
 $PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT refuse.net. A IN >outfile 2>&1
 cat outfile
@@ -260,6 +236,30 @@ cat outfile
 # on how fast the other server responds or the drop happens, but there are
 # a bunch of connection drops, whilst resolving the other queries.
 
+echo "> query drop.net."
+$PRE/streamtcp -f 127.0.0.1@$UNBOUND_PORT drop.net. A IN >outfile 2>&1
+cat outfile
+if test "$?" -ne 0; then
+	echo "exit status not OK"
+	echo "> cat logfiles"
+	cat outfile
+	cat unbound2.log
+	cat unbound.log
+	echo "Not OK"
+	exit 1
+fi
+if grep "rcode: SERVFAIL" outfile; then
+	echo "content OK"
+else
+	echo "result contents not OK, for drop.net"
+	echo "> cat logfiles"
+	cat outfile
+	cat unbound2.log
+	cat unbound.log
+	echo "result contents not OK, for drop.net"
+	exit 1
+fi
+
 
 # timeouts at the end. (so that the server is not marked as failed for
 # the other tests).