Merge "Remove useless files in Bottlenecks repo"

[bottlenecks.git] / verify.sh

diff --git a/verify.sh b/verify.sh
index 1e0d013..b5748c3 100755 (executable)
--- a/verify.sh
+++ b/verify.sh
@@ -12,14 +12,17 @@
 # Run flake8, unit, coverage test
 
 getopts ":f" FILE_OPTION
+STYLE_CHECK_DIRS="testsuites/posca/ utils/ monitor/ test-scheduler/"
 
 run_flake8() {
-    echo "Running flake8 ... "
+    echo "========================================="
+    echo "Running flake8 for python style check:   "
+    echo "-----------------------------------------"
     logfile=flake8_verify.log
     if [ $FILE_OPTION == "f" ]; then
-       flake8 --append-config=flake8_cfg testsuites/posca/ utils/ > $logfile
+       flake8 --append-config=flake8_cfg ${STYLE_CHECK_DIRS} > $logfile
     else
-       flake8 --append-config=flake8_cfg testsuites/posca/ utils/
+       flake8 --append-config=flake8_cfg ${STYLE_CHECK_DIRS}
     fi
 
     if [ $? -ne 0 ]; then
@@ -29,20 +32,37 @@ run_flake8() {
         fi
         exit 1
     else
-        echo "OK"
+        echo "The patch has passed python style check  "
+        echo "===================END==================="
     fi
 }
 
-run_tests() {
-    echo "Running unittest ... "
-    #will add future
-}
 
-run_coverage() {
-    echo "Running coverage ..."
-    #will add future
+run_nosetests() {
+    echo "========================================="
+    echo "Running unit and coverage test:          "
+    echo "-----------------------------------------"
+    nosetests --with-coverage --cover-tests \
+        --cover-min-percentage 100 \
+        test/__init__.py \
+        testsuites/posca/__init__.py testsuites/__init__.py \
+        testsuites/posca/testcase_cfg/__init__.py \
+        testsuites/posca/testcase_dashboard/__init__.py \
+        testsuites/posca/testcase_script/__init__.py \
+        utils/__init__.py \
+        utils/dashboard/__init__.py \
+        utils/env_prepare/__init__.py \
+        utils/infra_setup/__init__.py \
+        monitor/__init__.py \
+        monitor/dashboard/__init__.py \
+        monitor/dispatch/__init__.py
+    echo "===================END==================="
+
 }
 
+
+for((i=1;i<=1;i++));do echo -e "\n";done
 run_flake8
-run_tests
-run_coverage
+
+for((i=1;i<=1;i++));do echo -e "\n";done
+run_nosetests