X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=run_tests.sh;h=b3cbfb12747bab4ce1edf0f324df525aebb72bb6;hb=2d92fa6a31e6315b9cf3166a27b6fb4db2a5b5cc;hp=b4ddc94ce44e44850c9866fa20a3b5a436ef303b;hpb=531ac9968cf8703ad7a2c70f45837ce0e81dbec9;p=yardstick.git

diff --git a/run_tests.sh b/run_tests.sh
index b4ddc94ce..b3cbfb127 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -9,10 +9,19 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-# Run yardstick's test suite(s)
+# Run yardstick's flake8, unit, coverage, functional test
 
 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
@@ -53,6 +65,14 @@ run_tests() {
     fi
 }
 
+run_coverage() {
+    # 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() {
 
     mkdir -p .testrepository
@@ -62,8 +82,15 @@ run_functional_test() {
     EXIT_CODE=$?
     subunit-stats < .testrepository/subunit.log
 
-    exit $EXIT_CODE
+    if [ $EXIT_CODE -ne 0 ]; then
+        exit 1
+    else
+        echo "OK"
+    fi
 }
+
+
 run_flake8
 run_tests
+run_coverage
 run_functional_test