X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=run_tests.sh;h=972f6a27f24511590e604a92419d4a8366b4a462;hb=e69a79aa8242bda326567e8ae514bd9acdcca91b;hp=b2bf807c1971754c234b27c67f38bde3704ffc10;hpb=f68ce570fd0eefb17bfc9e1e75c57b24050db89e;p=yardstick.git

diff --git a/run_tests.sh b/run_tests.sh
index b2bf807c1..972f6a27f 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -9,31 +9,74 @@
 # 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 ... "
-    python -m unittest discover -s tests/unit
+    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
-        echo "OK, result in $logfile"
+        if [ $FILE_OPTION == "f" ]; then
+            echo "OK, results in $logfile"
+        fi
     fi
 }
 
-run_flake8
-#run_tests
+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"
+    fi
+}
+
+export PYTHONPATH='yardstick/vTC/apexlake'
+
+run_flake8
+run_tests
+run_coverage
+run_functional_test