- Fix stream_ssl, ssl_req_order and ssl_req_timeout tests for

  alloc check debug output.

diff --git a/doc/Changelog b/doc/Changelog
index fe32245eea72fc4bb24d6575f005a6bede7d150a..ff370f0b262a0256a48fe50987ecdbcbb4cd2393 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,8 @@
 30 September 2020: Wouter
        - Fix doh tests when not compiled in.
        - Add dohclient test executable to gitignore.
+       - Fix stream_ssl, ssl_req_order and ssl_req_timeout tests for
+         alloc check debug output.
 
 29 September 2020: Ralph
        - DNS Flag Day 2020: change edns-buffer-size default to 1232.

diff --git a/testdata/ssl_req_order.tdir/ssl_req_order.test b/testdata/ssl_req_order.tdir/ssl_req_order.test
index 65981d16cea4ffb97962b2c4528010cc1904d8b6..360a09922fe767635e8f428fee9c7e7933633e0e 100644 (file)
--- a/testdata/ssl_req_order.tdir/ssl_req_order.test
+++ b/testdata/ssl_req_order.tdir/ssl_req_order.test
@@ -11,12 +11,14 @@ get_make
 
 # this test query should just work (server is up)
 echo "> query www1.example.net."
-$PRE/streamtcp -s -f 127.0.0.1@$UNBOUND_PORT www1.example.net. A IN >outfile 2>&1
+$PRE/streamtcp -s -f 127.0.0.1@$UNBOUND_PORT www1.example.net. A IN >outfile 2>outerr
 cat outfile
+cat outerr
 if test "$?" -ne 0; then
        echo "exit status not OK"
        echo "> cat logfiles"
        cat outfile
+       cat outerr
        cat fwd.log 
        cat unbound.log
        echo "Not OK"
@@ -28,6 +30,7 @@ else
        echo "result contents not OK"
        echo "> cat logfiles"
        cat outfile
+       cat outerr
        cat fwd.log 
        cat unbound.log
        echo "result contents not OK"
@@ -37,12 +40,14 @@ echo "OK"
 
 # multiple requests (from localdata)
 echo "> query www1.example.net. www2.example.net. www3.example.net."
-$PRE/streamtcp -s -f 127.0.0.1@$UNBOUND_PORT www1.example.net. A IN www2.example.net A IN www3.example.net A IN >outfile 2>&1
+$PRE/streamtcp -s -f 127.0.0.1@$UNBOUND_PORT www1.example.net. A IN www2.example.net A IN www3.example.net A IN >outfile 2>outerr
 cat outfile
+cat outerr
 if test "$?" -ne 0; then
        echo "exit status not OK"
        echo "> cat logfiles"
        cat outfile
+       cat outerr
        cat fwd.log 
        cat unbound.log
        echo "Not OK"
@@ -54,6 +59,7 @@ else
        echo "result contents not OK"
        echo "> cat logfiles"
        cat outfile
+       cat outerr
        cat fwd.log 
        cat unbound.log
        echo "result contents not OK"
@@ -65,6 +71,7 @@ else
        echo "result contents not OK"
        echo "> cat logfiles"
        cat outfile
+       cat outerr
        cat fwd.log 
        cat unbound.log
        echo "result contents not OK"
@@ -76,6 +83,7 @@ else
        echo "result contents not OK"
        echo "> cat logfiles"
        cat outfile
+       cat outerr
        cat fwd.log 
        cat unbound.log
        echo "result contents not OK"
@@ -85,12 +93,14 @@ fi
 # out of order requests, the example.com elements take 2 seconds to wait.
 echo ""
 echo "> query www1.example.net. www.example.com. www2.example.net. www2.example.com. www3.example.net."
-$PRE/streamtcp -a -s -f 127.0.0.1@$UNBOUND_PORT www1.example.net. A IN www.example.com. A IN www2.example.net A IN www2.example.com. A IN www3.example.net A IN >outfile 2>&1
+$PRE/streamtcp -a -s -f 127.0.0.1@$UNBOUND_PORT www1.example.net. A IN www.example.com. A IN www2.example.net A IN www2.example.com. A IN www3.example.net A IN >outfile 2>outerr
 cat outfile
+cat outerr
 if test "$?" -ne 0; then
        echo "exit status not OK"
        echo "> cat logfiles"
        cat outfile
+       cat outerr
        cat fwd.log 
        cat unbound.log
        echo "Not OK"
@@ -102,6 +112,7 @@ else
        echo "result contents not OK"
        echo "> cat logfiles"
        cat outfile
+       cat outerr
        cat fwd.log 
        cat unbound.log
        echo "result contents not OK"
@@ -113,6 +124,7 @@ else
        echo "result contents not OK"
        echo "> cat logfiles"
        cat outfile
+       cat outerr
        cat fwd.log 
        cat unbound.log
        echo "result contents not OK"
@@ -124,6 +136,7 @@ else
        echo "result contents not OK"
        echo "> cat logfiles"
        cat outfile
+       cat outerr
        cat fwd.log 
        cat unbound.log
        echo "result contents not OK"
@@ -135,6 +148,7 @@ else
        echo "result contents not OK"
        echo "> cat logfiles"
        cat outfile
+       cat outerr
        cat fwd.log 
        cat unbound.log
        echo "result contents not OK"
@@ -146,6 +160,7 @@ else
        echo "result contents not OK"
        echo "> cat logfiles"
        cat outfile
+       cat outerr
        cat fwd.log 
        cat unbound.log
        echo "result contents not OK"
@@ -156,12 +171,14 @@ fi
 # www.example.com present twice, answered twice.
 echo ""
 echo "> query www1.example.net. www.example.com. www2.example.net. www.example.com. www3.example.net."
-$PRE/streamtcp -a -s -f 127.0.0.1@$UNBOUND_PORT www1.example.net. A IN www.example.com. A IN www2.example.net A IN www.example.com. A IN www3.example.net A IN >outfile 2>&1
+$PRE/streamtcp -a -s -f 127.0.0.1@$UNBOUND_PORT www1.example.net. A IN www.example.com. A IN www2.example.net A IN www.example.com. A IN www3.example.net A IN >outfile 2>outerr
 cat outfile
+cat outerr
 if test "$?" -ne 0; then
        echo "exit status not OK"
        echo "> cat logfiles"
        cat outfile
+       cat outerr
        cat fwd.log 
        cat unbound.log
        echo "Not OK"
@@ -173,6 +190,7 @@ else
        echo "result contents not OK"
        echo "> cat logfiles"
        cat outfile
+       cat outerr
        cat fwd.log 
        cat unbound.log
        echo "result contents not OK"
@@ -184,6 +202,7 @@ else
        echo "result contents not OK"
        echo "> cat logfiles"
        cat outfile
+       cat outerr
        cat fwd.log 
        cat unbound.log
        echo "result contents not OK"
@@ -195,6 +214,7 @@ else
        echo "result contents not OK"
        echo "> cat logfiles"
        cat outfile
+       cat outerr
        cat fwd.log 
        cat unbound.log
        echo "result contents not OK"
@@ -206,6 +226,7 @@ else
        echo "result contents not OK"
        echo "> cat logfiles"
        cat outfile
+       cat outerr
        cat fwd.log 
        cat unbound.log
        echo "result contents not OK"
@@ -216,12 +237,14 @@ fi
 # www3.example.com present twice, answered twice.
 echo ""
 echo "> query www1.example.net. www3.example.com. www2.example.net. www3.example.com. www3.example.net."
-$PRE/streamtcp -a -s -f 127.0.0.1@$UNBOUND_PORT www1.example.net. A IN www3.example.com. A IN www2.example.net A IN www3.example.com. A IN www3.example.net A IN >outfile 2>&1
+$PRE/streamtcp -a -s -f 127.0.0.1@$UNBOUND_PORT www1.example.net. A IN www3.example.com. A IN www2.example.net A IN www3.example.com. A IN www3.example.net A IN >outfile 2>outerr
 cat outfile
+cat outerr
 if test "$?" -ne 0; then
        echo "exit status not OK"
        echo "> cat logfiles"
        cat outfile
+       cat outerr
        cat fwd.log 
        cat unbound.log
        echo "Not OK"
@@ -233,6 +256,7 @@ else
        echo "result contents not OK"
        echo "> cat logfiles"
        cat outfile
+       cat outerr
        cat fwd.log 
        cat unbound.log
        echo "result contents not OK"
@@ -244,6 +268,7 @@ else
        echo "result contents not OK"
        echo "> cat logfiles"
        cat outfile
+       cat outerr
        cat fwd.log 
        cat unbound.log
        echo "result contents not OK"
@@ -255,6 +280,7 @@ else
        echo "result contents not OK"
        echo "> cat logfiles"
        cat outfile
+       cat outerr
        cat fwd.log 
        cat unbound.log
        echo "result contents not OK"
@@ -266,6 +292,7 @@ else
        echo "result contents not OK"
        echo "> cat logfiles"
        cat outfile
+       cat outerr
        cat fwd.log 
        cat unbound.log
        echo "result contents not OK"
@@ -274,12 +301,14 @@ fi
 
 echo ""
 echo "> query www4.example.com. www3.example.net."
-$PRE/streamtcp -a -s -f 127.0.0.1@$UNBOUND_PORT www4.example.com. A IN www3.example.net A IN >outfile 2>&1
+$PRE/streamtcp -a -s -f 127.0.0.1@$UNBOUND_PORT www4.example.com. A IN www3.example.net A IN >outfile 2>outerr
 cat outfile
+cat outerr
 if test "$?" -ne 0; then
        echo "exit status not OK"
        echo "> cat logfiles"
        cat outfile
+       cat outerr
        cat fwd.log 
        cat unbound.log
        echo "Not OK"
@@ -291,6 +320,7 @@ else
        echo "result contents not OK"
        echo "> cat logfiles"
        cat outfile
+       cat outerr
        cat fwd.log 
        cat unbound.log
        echo "result contents not OK"
@@ -302,6 +332,7 @@ else
        echo "result contents not OK"
        echo "> cat logfiles"
        cat outfile
+       cat outerr
        cat fwd.log 
        cat unbound.log
        echo "result contents not OK"
@@ -310,12 +341,14 @@ fi
 
 echo ""
 echo "> query a1.example.com. - a100.example.com."
-$PRE/streamtcp -a -s -f 127.0.0.1@$UNBOUND_PORT www6.example.com. A IN a1.a.example.com. A IN a2.a.example.com. A IN a3.a.example.com. A IN a4.a.example.com. A IN a5.a.example.com. A IN a6.a.example.com. A IN a7.a.example.com. A IN a8.a.example.com. A IN a9.a.example.com. A IN a10.a.example.com. A IN a11.a.example.com. A IN a12.a.example.com. A IN a13.a.example.com. A IN a14.a.example.com. A IN a15.a.example.com. A IN a16.a.example.com. A IN a17.a.example.com. A IN a18.a.example.com. A IN a19.a.example.com. A IN a20.a.example.com. A IN a21.a.example.com. A IN a22.a.example.com. A IN a23.a.example.com. A IN a24.a.example.com. A IN a25.a.example.com. A IN a26.a.example.com. A IN a27.a.example.com. A IN a28.a.example.com. A IN a29.a.example.com. A IN a30.a.example.com. A IN a31.a.example.com. A IN a32.a.example.com. A IN a33.a.example.com. A IN a34.a.example.com. A IN a35.a.example.com. A IN a36.a.example.com. A IN a37.a.example.com. A IN a38.a.example.com. A IN a39.a.example.com. A IN a40.a.example.com. A IN a41.a.example.com. A IN a42.a.example.com. A IN a43.a.example.com. A IN a44.a.example.com. A IN a45.a.example.com. A IN a46.a.example.com. A IN a47.a.example.com. A IN a48.a.example.com. A IN a49.a.example.com. A IN a50.a.example.com. A IN a51.a.example.com. A IN a52.a.example.com. A IN a53.a.example.com. A IN a54.a.example.com. A IN a55.a.example.com. A IN a56.a.example.com. A IN a57.a.example.com. A IN a58.a.example.com. A IN a59.a.example.com. A IN a60.a.example.com. A IN a61.a.example.com. A IN a62.a.example.com. A IN a63.a.example.com. A IN a64.a.example.com. A IN a65.a.example.com. A IN a66.a.example.com. A IN a67.a.example.com. A IN a68.a.example.com. A IN a69.a.example.com. A IN a70.a.example.com. A IN a71.a.example.com. A IN a72.a.example.com. A IN a73.a.example.com. A IN a74.a.example.com. A IN a75.a.example.com. A IN a76.a.example.com. A IN a77.a.example.com. A IN a78.a.example.com. A IN a79.a.example.com. A IN a80.a.example.com. A IN a81.a.example.com. A IN a82.a.example.com. A IN a83.a.example.com. A IN a84.a.example.com. A IN a85.a.example.com. A IN a86.a.example.com. A IN a87.a.example.com. A IN a88.a.example.com. A IN a89.a.example.com. A IN a90.a.example.com. A IN a91.a.example.com. A IN a92.a.example.com. A IN a93.a.example.com. A IN a94.a.example.com. A IN a95.a.example.com. A IN a96.a.example.com. A IN a97.a.example.com. A IN a98.a.example.com. A IN a99.a.example.com. A IN a100.a.example.com. A IN >outfile 2>&1
+$PRE/streamtcp -a -s -f 127.0.0.1@$UNBOUND_PORT www6.example.com. A IN a1.a.example.com. A IN a2.a.example.com. A IN a3.a.example.com. A IN a4.a.example.com. A IN a5.a.example.com. A IN a6.a.example.com. A IN a7.a.example.com. A IN a8.a.example.com. A IN a9.a.example.com. A IN a10.a.example.com. A IN a11.a.example.com. A IN a12.a.example.com. A IN a13.a.example.com. A IN a14.a.example.com. A IN a15.a.example.com. A IN a16.a.example.com. A IN a17.a.example.com. A IN a18.a.example.com. A IN a19.a.example.com. A IN a20.a.example.com. A IN a21.a.example.com. A IN a22.a.example.com. A IN a23.a.example.com. A IN a24.a.example.com. A IN a25.a.example.com. A IN a26.a.example.com. A IN a27.a.example.com. A IN a28.a.example.com. A IN a29.a.example.com. A IN a30.a.example.com. A IN a31.a.example.com. A IN a32.a.example.com. A IN a33.a.example.com. A IN a34.a.example.com. A IN a35.a.example.com. A IN a36.a.example.com. A IN a37.a.example.com. A IN a38.a.example.com. A IN a39.a.example.com. A IN a40.a.example.com. A IN a41.a.example.com. A IN a42.a.example.com. A IN a43.a.example.com. A IN a44.a.example.com. A IN a45.a.example.com. A IN a46.a.example.com. A IN a47.a.example.com. A IN a48.a.example.com. A IN a49.a.example.com. A IN a50.a.example.com. A IN a51.a.example.com. A IN a52.a.example.com. A IN a53.a.example.com. A IN a54.a.example.com. A IN a55.a.example.com. A IN a56.a.example.com. A IN a57.a.example.com. A IN a58.a.example.com. A IN a59.a.example.com. A IN a60.a.example.com. A IN a61.a.example.com. A IN a62.a.example.com. A IN a63.a.example.com. A IN a64.a.example.com. A IN a65.a.example.com. A IN a66.a.example.com. A IN a67.a.example.com. A IN a68.a.example.com. A IN a69.a.example.com. A IN a70.a.example.com. A IN a71.a.example.com. A IN a72.a.example.com. A IN a73.a.example.com. A IN a74.a.example.com. A IN a75.a.example.com. A IN a76.a.example.com. A IN a77.a.example.com. A IN a78.a.example.com. A IN a79.a.example.com. A IN a80.a.example.com. A IN a81.a.example.com. A IN a82.a.example.com. A IN a83.a.example.com. A IN a84.a.example.com. A IN a85.a.example.com. A IN a86.a.example.com. A IN a87.a.example.com. A IN a88.a.example.com. A IN a89.a.example.com. A IN a90.a.example.com. A IN a91.a.example.com. A IN a92.a.example.com. A IN a93.a.example.com. A IN a94.a.example.com. A IN a95.a.example.com. A IN a96.a.example.com. A IN a97.a.example.com. A IN a98.a.example.com. A IN a99.a.example.com. A IN a100.a.example.com. A IN >outfile 2>outerr
 cat outfile
+cat outerr
 if test "$?" -ne 0; then
        echo "exit status not OK"
        echo "> cat logfiles"
        cat outfile
+       cat outerr
        cat fwd.log 
        cat unbound.log
        echo "Not OK"
@@ -325,12 +358,14 @@ grep "a.example.com.      IN      A" outfile
 
 echo ""
 echo "> query www5.example.net. www3.example.net. www.drop.net."
-$PRE/streamtcp -a -s -f 127.0.0.1@$UNBOUND_PORT www5.example.com. A IN www3.example.net A IN www.drop.net A IN >outfile 2>&1
+$PRE/streamtcp -a -s -f 127.0.0.1@$UNBOUND_PORT www5.example.com. A IN www3.example.net A IN www.drop.net A IN >outfile 2>outerr
 cat outfile
+cat outerr
 if test "$?" -ne 0; then
        echo "exit status not OK"
        echo "> cat logfiles"
        cat outfile
+       cat outerr
        cat fwd.log 
        cat unbound.log
        echo "Not OK"

diff --git a/testdata/ssl_req_timeout.tdir/ssl_req_timeout.test b/testdata/ssl_req_timeout.tdir/ssl_req_timeout.test
index 5223fc9853b3e982bd546cb70e9deab7eae757e0..7f6527e0d6a671778192da0047b46f8800faa7cc 100644 (file)
--- a/testdata/ssl_req_timeout.tdir/ssl_req_timeout.test
+++ b/testdata/ssl_req_timeout.tdir/ssl_req_timeout.test
@@ -17,12 +17,14 @@ fi
 
 # this test query should just work (server is up)
 echo "> query www1.example.net."
-$PRE/streamtcp -s -f 127.0.0.1@$UNBOUND_PORT www1.example.net. A IN >outfile 2>&1
+$PRE/streamtcp -s -f 127.0.0.1@$UNBOUND_PORT www1.example.net. A IN >outfile 2>outerr
 cat outfile
+cat outerr
 if test "$?" -ne 0; then
        echo "exit status not OK"
        echo "> cat logfiles"
        cat outfile
+       cat outerr
        cat fwd.log 
        cat unbound.log
        echo "Not OK"
@@ -34,6 +36,7 @@ else
        echo "result contents not OK"
        echo "> cat logfiles"
        cat outfile
+       cat outerr
        cat fwd.log 
        cat unbound.log
        echo "result contents not OK"
@@ -43,12 +46,14 @@ echo "OK"
 
 # multiple requests that are answered immediately and then the timeout
 echo "> query www1.example.net. www2.example.net. www3.example.net. www.example.com."
-$PRE/streamtcp -a -s -f 127.0.0.1@$UNBOUND_PORT www1.example.net. A IN www2.example.net A IN www3.example.net A IN www.example.com. A IN >outfile 2>&1
+$PRE/streamtcp -a -s -f 127.0.0.1@$UNBOUND_PORT www1.example.net. A IN www2.example.net A IN www3.example.net A IN www.example.com. A IN >outfile 2>outerr
 cat outfile
+cat outerr
 if test "$?" -ne 0; then
        echo "exit status not OK"
        echo "> cat logfiles"
        cat outfile
+       cat outerr
        cat fwd.log 
        cat unbound.log
        echo "Not OK"
@@ -60,6 +65,7 @@ else
        echo "result contents not OK"
        echo "> cat logfiles"
        cat outfile
+       cat outerr
        cat fwd.log 
        cat unbound.log
        echo "result contents not OK"
@@ -71,6 +77,7 @@ else
        echo "result contents not OK"
        echo "> cat logfiles"
        cat outfile
+       cat outerr
        cat fwd.log 
        cat unbound.log
        echo "result contents not OK"
@@ -82,6 +89,7 @@ else
        echo "result contents not OK"
        echo "> cat logfiles"
        cat outfile
+       cat outerr
        cat fwd.log 
        cat unbound.log
        echo "result contents not OK"
@@ -93,6 +101,7 @@ else
        echo "result contents not OK"
        echo "> cat logfiles"
        cat outfile
+       cat outerr
        cat fwd.log 
        cat unbound.log
        echo "result contents not OK"
@@ -101,12 +110,14 @@ fi
 
 # multiple requests that are waiting for answers and then the timeout
 echo "> query www2.example.com. www2.example.com. www3.example.com."
-$PRE/streamtcp -a -s -f 127.0.0.1@$UNBOUND_PORT www2.example.com. A IN www2.example.com A IN www3.example.com A IN >outfile 2>&1
+$PRE/streamtcp -a -s -f 127.0.0.1@$UNBOUND_PORT www2.example.com. A IN www2.example.com A IN www3.example.com A IN >outfile 2>outerr
 cat outfile
+cat outerr
 if test "$?" -ne 0; then
        echo "exit status not OK"
        echo "> cat logfiles"
        cat outfile
+       cat outerr
        cat fwd.log 
        cat unbound.log
        echo "Not OK"
@@ -118,6 +129,7 @@ else
        echo "result contents not OK"
        echo "> cat logfiles"
        cat outfile
+       cat outerr
        cat fwd.log 
        cat unbound.log
        echo "result contents not OK"

diff --git a/testdata/stream_ssl.tdir/stream_ssl.test b/testdata/stream_ssl.tdir/stream_ssl.test
index 08bbcdee92054289d44cf40e3f0ad2f9d91cd4ba..b5bc2d911b6228f22e90a91527687e9683663699 100644 (file)
--- a/testdata/stream_ssl.tdir/stream_ssl.test
+++ b/testdata/stream_ssl.tdir/stream_ssl.test
@@ -11,11 +11,12 @@ get_make
 
 # first test streamtcp against the server unbound.
 echo "> streamtcp -s www.example.com A IN"
-$PRE/streamtcp -s -f 127.0.0.1@$SERV_PORT www.example.com. A IN >outfile 2>&1
+$PRE/streamtcp -s -f 127.0.0.1@$SERV_PORT www.example.com. A IN >outfile 2>outerr
 if test "$?" -ne 0; then
        echo "exit status not OK"
        echo "> cat logfiles"
        cat outfile
+       cat outerr
        echo "SSLSERVICE"
        cat unboundserv.log
        echo "SSLCLIENT"
@@ -27,6 +28,7 @@ else
 fi
 echo "> cat logfiles"
 cat outfile
+cat outerr
 echo "SSLSERVICE"
 cat unboundserv.log
 echo "SSLCLIENT"