X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=run_tests.sh;h=b3cbfb12747bab4ce1edf0f324df525aebb72bb6;hb=378171687bda92d031437b0d8cc90968c1655b9d;hp=972f6a27f24511590e604a92419d4a8366b4a462;hpb=41dde94d0a4e575317c297e124ba0624e64c8552;p=yardstick.git

diff --git a/run_tests.sh b/run_tests.sh
index 972f6a27f..b3cbfb127 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -13,6 +13,15 @@
 
 getopts ":f" FILE_OPTION
 
+# don't write .pyc files this can cause odd unittest results
+export PYTHONDONTWRITEBYTECODE=1
+
+PY_VER="py$( python --version | sed 's/[^[:digit:]]//g' | cut -c-2 )"
+export PY_VER
+
+COVER_DIR_NAME="./tests/ci/"
+export COVER_DIR_NAME
+
 run_flake8() {
     echo "Running flake8 ... "
     logfile=test_results.log
@@ -33,7 +42,10 @@ run_flake8() {
     fi
 }
 
+
 run_tests() {
+    echo "Get external libs needed for unit test"
+
     echo "Running unittest ... "
     if [ $FILE_OPTION == "f" ]; then
         python -m unittest discover -v -s tests/unit > $logfile 2>&1
@@ -54,8 +66,11 @@ run_tests() {
 }
 
 run_coverage() {
-    source tests/ci/cover.sh
-    run_coverage_test
+    # don't re-run coverage on both py27 py3, it takes too long
+    if [[ -z $SKIP_COVERAGE ]] ; then
+        source $COVER_DIR_NAME/cover.sh
+        run_coverage_test
+    fi
 }
 
 run_functional_test() {
@@ -74,7 +89,6 @@ run_functional_test() {
     fi
 }
 
-export PYTHONPATH='yardstick/vTC/apexlake'
 
 run_flake8
 run_tests