X-Git-Url: https://wannabe.guru.org/gitweb/?a=blobdiff_plain;f=tests%2Frun_tests.sh;h=486bd4e220024cdc194b5441d82677cc4e869a08;hb=986d5f7ada15e56019518db43d07b76f94468e1a;hp=6e0c30cf1b3c5ddb9ec6da18b2fb3c5f0553be0e;hpb=6f132c0342ab7aa438ed88d7c5f987cb52d8ca05;p=python_utils.git

diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index 6e0c30c..486bd4e 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -37,6 +37,18 @@ make_header() {
     echo
 }
 
+function usage() {
+    echo "Usage: $0 [-a]|[-i][-u][-d]"
+    echo
+    echo "Runs tests under ${ROOT}.  Options control which test types:"
+    echo
+    echo "    -a | --all . . . . . . . . . . . . Run all types of tests"
+    echo "    -d | --doctests  . . . . . . . . . Run doctests"
+    echo "    -u | --unittests . . . . . . . . . Run unittests"
+    echo "    -i | --integration . . . . . . . . Run integration tests"
+    echo
+    exit 1
+}
 
 while [[ $# -gt 0 ]]; do
     key="$1"
@@ -56,33 +68,35 @@ while [[ $# -gt 0 ]]; do
             INTEGRATION=1
             ;;
         *)    # unknown option
-            echo "Usage: $0 [-a]|[-i][-u][-d]"
-            echo
-            echo "Runs tests under ${ROOT}.  Options control which test types:"
-            echo
-            echo "    -a | --all . . . . . . . . . . . . Run all types of tests"
-            echo "    -d | --doctests  . . . . . . . . . Run doctests"
-            echo "    -u | --unittests . . . . . . . . . Run unittests"
-            echo "    -i | --integration . . . . . . . . Run integration tests"
-            echo
             echo "Argument $key was not recognized."
+            echo
+            usage
             exit 1
             ;;
     esac
     shift
 done
 
+if [ $(expr ${DOCTEST} + ${UNITTEST} + ${INTEGRATION}) -eq 0 ]; then
+    usage
+    exit 2
+fi
+
+
+FAILED_TESTS=""
 if [ ${DOCTEST} -eq 1 ]; then
     for doctest in $(grep -lR doctest ${ROOT}/*.py); do
         BASE=$(basename ${doctest})
         BASE="${BASE} (doctest)"
         make_header "${BASE}" "${CYAN}"
         OUT=$( python3 ${doctest} 2>&1 )
-        if [ "$OUT" == "" ]; then
+        FAILED=$( echo "${OUT}" | grep '\*\*\*Test Failed\*\*\*' | wc -l )
+        if [ $FAILED == 0 ]; then
             echo "OK"
         else
-            echo -e "${OUT}"
+            echo -e "${FAILED}"
             FAILURES=$((FAILURES+1))
+            FAILED_TESTS="${FAILED_TESTS}, ${BASE}"
         fi
     done
 fi
@@ -95,6 +109,7 @@ if [ ${UNITTEST} -eq 1 ]; then
         ${test}
         if [ $? -ne 0 ]; then
             FAILURES=$((FAILURES+1))
+            FAILED_TESTS="${FAILED_TESTS}, ${BASE}"
         fi
     done
 fi
@@ -107,10 +122,20 @@ if [ ${INTEGRATION} -eq 1 ]; then
         ${test}
         if [ $? -ne 0 ]; then
             FAILURES=$((FAILURES+1))
+            FAILED_TESTS="${FAILED_TESTS}, ${BASE}"
         fi
     done
 fi
 
 if [ ${FAILURES} -ne 0 ]; then
-    echo -e "${RED}There were ${FAILURES} failure(s).${NC}"
+    FAILED_TESTS=$(echo ${FAILED_TESTS} | sed 's/^, //g')
+    if [ ${FAILURES} -eq 1 ]; then
+        echo -e "${RED}There was ${FAILURES} failure:"
+    else
+        echo -e "${RED}There were ${FAILURES} failures:"
+    fi
+    echo "${FAILED_TESTS}"
+    echo -e "${NC}"
+else
+    echo -e "${BLACK}${ON_GREEN}Everything looks good.${NC}"
 fi