Bump upstream dependencies for S-SR4

[transportpce.git] / tests / launch_tests.sh

diff --git a/tests/launch_tests.sh b/tests/launch_tests.sh
index c62307bd97665647133965a4b6fcda18610ec1e6..54d1cd1033eb34aca16125e960b430bfd71d2718 100755 (executable)
--- a/tests/launch_tests.sh
+++ b/tests/launch_tests.sh
@@ -1,5 +1,10 @@
 #!/bin/sh
 
+if [ -n "$USE_ODL_ALT_KARAF_ENV" ]; then
+    echo "using environment variables from $USE_ODL_ALT_KARAF_ENV"
+    . $USE_ODL_ALT_KARAF_ENV
+fi
+
 for arg in $@; do
     if [ -z "$test_suite" ]; then
         test_suite=$1
@@ -26,7 +31,7 @@ else
     done
 fi
 if [ -z "$LAUNCHER" ]; then
-    LAUNCHER="nosetests --with-xunit";
+    LAUNCHER="python3 -m pytest -q";
 fi
 
 for script in $scriptlist; do