From f3853a4087ac27b07d941b16bc3bfa5b562fa69b Mon Sep 17 00:00:00 2001
From: Otto <otto.moerbeek@open-xchange.com>
Date: Tue, 28 Sep 2021 15:33:31 +0200
Subject: [PATCH] Print summary after a failed dnsdist regress run and disable
 secpoll

---
 regression-tests.dnsdist/dnsdisttests.py | 1 +
 regression-tests.dnsdist/runtests        | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/regression-tests.dnsdist/dnsdisttests.py b/regression-tests.dnsdist/dnsdisttests.py
index 60d8c8932b..9ccea5f500 100644
--- a/regression-tests.dnsdist/dnsdisttests.py
+++ b/regression-tests.dnsdist/dnsdisttests.py
@@ -89,6 +89,7 @@ class DNSDistTest(AssertEqualDNSMessageMixin, unittest.TestCase):
         with open(confFile, 'w') as conf:
             conf.write("-- Autogenerated by dnsdisttests.py\n")
             conf.write(cls._config_template % params)
+            conf.write("setSecurityPollSuffix('')")
 
         if cls._skipListeningOnCL:
           dnsdistcmd = [os.environ['DNSDISTBIN'], '--supervised', '-C', confFile ]
diff --git a/regression-tests.dnsdist/runtests b/regression-tests.dnsdist/runtests
index dcdc5441e5..a1d63945e5 100755
--- a/regression-tests.dnsdist/runtests
+++ b/regression-tests.dnsdist/runtests
@@ -49,12 +49,19 @@ openssl x509 -req -days 1 -CA ca.pem -CAkey ca.key -CAcreateserial -in server.cs
 # Generate a chain
 cat server.pem ca.pem > server.chain
 
-if ! nosetests --with-xunit $@; then
+out=$(mktemp)
+set -o pipefail
+if ! nosetests --with-xunit $@ 2>&1 | tee "${out}" ; then
     for log in configs/*.log; do
         echo "=== ${log} ==="
         cat "${log}"
+        echo
     done
+    echo "=== nosetests log ==="
+    cat "${out}"
+    echo "=== end of nosetests log ==="
     false
 fi
+rm -f "${out}"
 
 rm -f ca.key ca.pem ca.srl server.csr server.key server.pem server.chain server.ocsp
-- 
2.47.2