Print summary after a failed dnsdist regress run and disable secpoll

diff --git a/regression-tests.dnsdist/dnsdisttests.py b/regression-tests.dnsdist/dnsdisttests.py
index 60d8c8932b6e4f35797c773e638bcac1a773b62f..9ccea5f5008234bceb7271b7d69b9e9a03360b3a 100644 (file)
--- 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 dcdc5441e57edbfe1223c464274c147aa96bd846..a1d63945e5134cb47a944a909bcc68025ae78ef6 100755 (executable)
--- 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