From d684bee4b0a84cd0ec9070a7dcbfa0d21c9f87a4 Mon Sep 17 00:00:00 2001 From: "W.C.A. Wijngaards" Date: Fri, 31 Jul 2020 09:32:19 +0200 Subject: [PATCH] stream reuse, move drop in tcp_reuse test to timeout section of test. --- testdata/tcp_reuse.tdir/tcp_reuse.test | 48 +++++++++++++------------- 1 file changed, 24 insertions(+), 24 deletions(-) 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).