X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=run_tests.sh;h=2519d94f648cac6ca17a75d9f33e1b9bf9926e44;hb=d2261da988e5aaf883575ca51fbdf8e5202dce5c;hp=e7040e77f8097cf470ecfb39d5195b5aedf2b800;hpb=2d131cd335b35914133d3dd8d1d8f5741fc38eb0;p=yardstick.git

diff --git a/run_tests.sh b/run_tests.sh
index e7040e77f..2519d94f6 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -9,30 +9,77 @@
 # 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
 
 run_flake8() {
-    echo -n "Running flake8 ... "
-    logfile=pep8.log
-    flake8 yardstick > $logfile
+    echo "Running flake8 ... "
+    logfile=test_results.log
+    if [ $FILE_OPTION == "f" ]; then
+        flake8 yardstick > $logfile
+    else
+        flake8 yardstick
+    fi
+
     if [ $? -ne 0 ]; then
-        echo "FAILED, result in $logfile"
+        echo "FAILED"
+        if [ $FILE_OPTION == "f" ]; then
+            echo "Results in $logfile"
+        fi
+        exit 1
     else
-        echo "OK, result in $logfile"
+        echo "OK"
     fi
 }
 
+
 run_tests() {
-    echo -n "Running unittest ... "
-    logfile=test.log
-    python -m unittest discover -s yardstick/tests &> $logfile
+    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
+    else
+        python -m unittest discover -v -s tests/unit
+    fi
+
     if [ $? -ne 0 ]; then
-        echo "FAILED, result in $logfile"
+        if [ $FILE_OPTION == "f" ]; then
+            echo "FAILED, results in $logfile"
+        fi
+        exit 1
+    else
+        if [ $FILE_OPTION == "f" ]; then
+            echo "OK, results in $logfile"
+        fi
+    fi
+}
+
+run_coverage() {
+    source tests/ci/cover.sh
+    run_coverage_test
+}
+
+run_functional_test() {
+
+    mkdir -p .testrepository
+    python -m subunit.run discover tests/functional > .testrepository/subunit.log
+
+    subunit2pyunit < .testrepository/subunit.log
+    EXIT_CODE=$?
+    subunit-stats < .testrepository/subunit.log
+
+    if [ $EXIT_CODE -ne 0 ]; then
+        exit 1
     else
-        echo "OK, result in $logfile"
+        echo "OK"
     fi
 }
 
+export PYTHONPATH='yardstick/vTC/apexlake'
+
 run_flake8
 run_tests
-
+run_coverage
+run_functional_test