X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=run_tests.sh;h=b3cbfb12747bab4ce1edf0f324df525aebb72bb6;hb=fecd5406d7d192f812ac84bf8093f1c6688eea18;hp=1f985b6c18acfc46bc859d593343440fd2ca3a79;hpb=5c8396ba5bbeb12c70dae6ad3e777a28fefbcb4a;p=yardstick.git

diff --git a/run_tests.sh b/run_tests.sh
index 1f985b6c1..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,32 +42,9 @@ run_flake8() {
     fi
 }
 
-get_external_libs() {
-    cd $(dirname ${BASH_SOURCE[0]})
-    TREX_DOWNLOAD="https://trex-tgn.cisco.com/trex/release/v2.05.tar.gz"
-    TREX_DIR=$PWD/trex/scripts
-    if [ ! -d "$TREX_DIR" ]; then
-        rm -rf ${TREX_DOWNLOAD##*/}
-        if [ ! -e ${TREX_DOWNLOAD##*/} ] ; then
-            wget -nv $TREX_DOWNLOAD
-        fi
-        tar xf ${TREX_DOWNLOAD##*/}
-        pushd .
-        rm -rf trex && mkdir -p trex
-        mv v2.05 trex/scripts
-        rm -rf v2.05.tar.gz
-        touch "$PWD/trex/scripts/automation/trex_control_plane/stl/__init__.py"
-        popd
-    fi
-    echo "Done."
-    export PYTHONPATH=$PYTHONPATH:"$PWD/trex/scripts/automation/trex_control_plane"
-    export PYTHONPATH=$PYTHONPATH:"$PWD/trex/scripts/automation/trex_control_plane/stl"
-    echo $PYTHONPATH
-}
 
 run_tests() {
     echo "Get external libs needed for unit test"
-    get_external_libs
 
     echo "Running unittest ... "
     if [ $FILE_OPTION == "f" ]; then
@@ -80,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() {
@@ -100,7 +89,6 @@ run_functional_test() {
     fi
 }
 
-export PYTHONPATH='yardstick/vTC/apexlake'
 
 run_flake8
 run_tests