From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Tue, 17 Nov 2020 00:59:35 +0000 (-0500)
Subject: Additional fixes for Python 3 conversion
X-Git-Tag: auth-4.4.0-beta1~9^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2f08b8d676bdaa4205c76565aa83a743e1f7b97f;p=thirdparty%2Fpdns.git

Additional fixes for Python 3 conversion
---

diff --git a/build-scripts/test-recursor b/build-scripts/test-recursor
index 919f6e731f..143e7c4c7a 100755
--- a/build-scripts/test-recursor
+++ b/build-scripts/test-recursor
@@ -59,7 +59,7 @@ sleep 3
 ./clean.sh
 
 cd ../regression-tests.recursor-dnssec
-./runtests -e 'SNMP' || EXIT=1
+./runtests -e 'SNMP|Dnstap|Protobuf' || EXIT=1
 ./printlogs.py || true
 
 exit $EXIT
diff --git a/build-scripts/travis.sh b/build-scripts/travis.sh
index f1f10266c7..d42fe9c7af 100755
--- a/build-scripts/travis.sh
+++ b/build-scripts/travis.sh
@@ -629,7 +629,7 @@ test_dnsdist(){
   run "cd regression-tests.dnsdist"
   export SKIP_DOH_TESTS=1
   export SKIP_PROMETHEUS_TESTS=1
-  run "DNSDISTBIN=$HOME/dnsdist/bin/dnsdist ./runtests -v --ignore-files='(?:^\.|^_,|^setup\.py$|^test_TLSSessionResumption\.py$)'"
+  run "DNSDISTBIN=$HOME/dnsdist/bin/dnsdist ./runtests -v --ignore-files='(?:^\.|^_,|^setup\.py$|^test_(TLSSessionResumption|Dnstap|Protobuf)\.py$)'"
   run "rm -f ./DNSCryptResolver.cert ./DNSCryptResolver.key"
   run "cd .."
 }
diff --git a/regression-tests.recursor-dnssec/printlogs.py b/regression-tests.recursor-dnssec/printlogs.py
index ddec98b553..c4dde38d92 100755
--- a/regression-tests.recursor-dnssec/printlogs.py
+++ b/regression-tests.recursor-dnssec/printlogs.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 from __future__ import print_function
 import xml.etree.ElementTree
@@ -39,4 +39,3 @@ for child in root:
                 print("==============> STDOUT LOG FROM XML <==============")
                 print(elem.text)
                 print("==============> END STDOUT LOG FROM XML <==============")
-