X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=regression-tests.auth-py%2Fruntests;h=68797ebddc965805db0ee05be24f36d2e00f4c6e;hb=HEAD;hp=6c30ba8c6634b2fe3d102732ef0dd1405d76a4aa;hpb=bd90bdef57682590496bdfe98161afde9b383f74;p=thirdparty%2Fpdns.git

diff --git a/regression-tests.auth-py/runtests b/regression-tests.auth-py/runtests
index 6c30ba8c66..22f0b14639 100755
--- a/regression-tests.auth-py/runtests
+++ b/regression-tests.auth-py/runtests
@@ -1,14 +1,13 @@
 #!/usr/bin/env bash
 set -e
 
-readonly PYTHON=${PYTHON:-python2}
-
 if [ ! -d .venv ]; then
-    virtualenv -p ${PYTHON} .venv
+    python3 -m venv .venv
 fi
 
 . .venv/bin/activate
 python -V
+pip install -U pip wheel | cat
 pip install -q -r requirements.txt | cat
 
 mkdir -p configs
@@ -17,6 +16,7 @@ mkdir -p configs
 
 export PDNS=${PDNS:-${PWD}/../pdns/pdns_server}
 export PDNSUTIL=${PDNSUTIL:-${PWD}/../pdns/pdnsutil}
+export PDNSCONTROL=${PDNSCONTROL:-${PWD}/../pdns/pdns_control}
 
 export PREFIX=127.0.0
 
@@ -27,9 +27,20 @@ for bin in "$PDNS" "$PDNSUTIL"; do
   fi
 done
 
-set -e
 if [ "${PDNS_DEBUG}" = "YES" ]; then
   set -x
 fi
 
-nosetests --with-xunit $@
+ignore="--ignore=test_GSSTSIG.py"
+if [ "${WITHKERBEROS}" = "YES" ]; then
+    ignore=""
+    (cd kerberos-server && sudo docker compose up --detach --build)
+fi
+
+pytest --junitxml=pytest.xml $ignore $@
+ret=$?
+
+if [ "${WITHKERBEROS}" = "YES" ]; then
+    (cd kerberos-server && sudo docker compose stop || exit 0)
+fi
+exit $ret