X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Flaunch_tests.sh;h=54d1cd1033eb34aca16125e960b430bfd71d2718;hb=0f186173b3059abef2fa56f23a93ede62abe4569;hp=f1951c2205bf83d9186a62c7c77060df8e3bb3c9;hpb=af048201371f07dc4f8f389c135a51efa7638eac;p=transportpce.git

diff --git a/tests/launch_tests.sh b/tests/launch_tests.sh
index f1951c220..54d1cd103 100755
--- 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,7 @@ else
     done
 fi
 if [ -z "$LAUNCHER" ]; then
-    LAUNCHER="nosetests --with-xunit";
+    LAUNCHER="python3 -m pytest -q";
 fi
 
 for script in $scriptlist; do