Merge "Complement sims configuration files"

[transportpce.git] / tests / launch_tests.sh

diff --git a/tests/launch_tests.sh b/tests/launch_tests.sh
index f1951c2205bf83d9186a62c7c77060df8e3bb3c9..63beeb52887a007137409092f8e18964893bad8b 100755 (executable)
--- a/tests/launch_tests.sh
+++ b/tests/launch_tests.sh
@@ -1,7 +1,8 @@
 #!/bin/sh
 
-if [ "$USE_LIGHTY" != "True" ]; then
-    ./build_karaf_for_tests.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
@@ -30,7 +31,11 @@ else
     done
 fi
 if [ -z "$LAUNCHER" ]; then
-    LAUNCHER="nosetests --with-xunit";
+    if [ -d "allure-report" ]; then
+        LAUNCHER="python3 -m pytest --alluredir=allure-report/ -q"
+    else
+        LAUNCHER="python3 -m pytest -q"
+    fi
 fi
 
 for script in $scriptlist; do