tc053 kill haproxy wrong mismatch

[yardstick.git] / run_tests.sh

diff --git a/run_tests.sh b/run_tests.sh
index 2cf54c7..b3cbfb1 100755 (executable)
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -16,6 +16,12 @@ 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
@@ -60,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() {
@@ -80,7 +89,6 @@ run_functional_test() {
     fi
 }
 
-export PYTHONPATH='yardstick/vTC/apexlake'
 
 run_flake8
 run_tests