Merge pull request #2361 from taosdata/feature/sangshuduo/make-pytest-auto-find-so

Feature/sangshuduo/make pytest auto find so

tests/test-all.sh

@@ -1,22 +1,5 @@
 #!/bin/bash
 
-function runSimCaseOneByOne {
-  while read -r line; do
-    if [[ $line =~ ^run.* ]]; then
-      case=`echo $line | awk '{print $2}'`
-      ./test.sh -f $case 2>&1 | grep 'success\|failed\|fault' | grep -v 'default' | tee -a out.log
-    fi
-  done < $1
-}
-
-function runPyCaseOneByOne {
-  while read -r line; do
-    if [[ $line =~ ^python.* ]]; then
-      $line 2>&1 | grep 'successfully executed\|failed\|fault' | grep -v 'default'| tee -a pytest-out.log
-    fi
-  done < $1
-}
-
 # Color setting
 RED='\033[0;31m'
 GREEN='\033[1;32m'
@@ -24,15 +7,46 @@ GREEN_DARK='\033[0;32m'
 GREEN_UNDERLINE='\033[4;32m'
 NC='\033[0m'
 
+function runSimCaseOneByOne {
+  while read -r line; do
+    if [[ $line =~ ^run.* ]]; then
+      case=`echo $line | awk '{print $NF}'`
+      start_time=`date +%s`
+      ./test.sh -f $case > /dev/null 2>&1 && \
+        echo -e "${GREEN}$case success${NC}" | tee -a out.log || \
+        echo -e "${RED}$case failed${NC}" | tee -a out.log
+      end_time=`date +%s`
+      echo execution time of $case was `expr $end_time - $start_time`s. | tee -a out.log
+    fi
+  done < $1
+}
+
+function runPyCaseOneByOne {
+  while read -r line; do
+    if [[ $line =~ ^python.* ]]; then
+      if [[ $line != *sleep* ]]; then
+        case=`echo $line|awk '{print $NF}'`
+        start_time=`date +%s`
+        $line > /dev/null 2>&1 && \
+          echo -e "${GREEN}$case success${NC}" | tee -a pytest-out.log || \
+          echo -e "${RED}$case failed${NC}" | tee -a pytest-out.log
+        end_time=`date +%s`
+        echo execution time of $case was `expr $end_time - $start_time`s. | tee -a pytest-out.log
+      else
+        $line > /dev/null 2>&1
+      fi
+    fi
+  done < $1
+}
+
 totalFailed=0
 totalPyFailed=0
 
-
+tests_dir=`pwd`
-current_dir=`pwd`
 
 if [ "$2" != "python" ]; then
   echo "### run TSIM test case ###"
-  cd $current_dir/script
+  cd $tests_dir/script
 
   [ -f out.log ] && rm -f out.log
   if [ "$1" == "cron" ]; then
@@ -53,13 +67,13 @@ if [ "$2" != "python" ]; then
     totalSuccess=`expr $totalSuccess - $totalBasic`
   fi
 
-  echo -e "${GREEN} ### Total $totalSuccess TSIM case(s) succeed! ### ${NC}"
+  echo -e "\n${GREEN} ### Total $totalSuccess TSIM case(s) succeed! ### ${NC}"
 
   totalFailed=`grep 'failed\|fault' out.log | wc -l`
 # echo -e "${RED} ### Total $totalFailed TSIM case(s) failed! ### ${NC}"
 
   if [ "$totalFailed" -ne "0" ]; then
-    echo -e "${RED} ### Total $totalFailed TSIM case(s) failed! ### ${NC}"
+    echo -e "\n${RED} ### Total $totalFailed TSIM case(s) failed! ### ${NC}"
 
 #  exit $totalFailed
   fi
@@ -67,7 +81,27 @@ fi
 
 if [ "$2" != "sim" ]; then
   echo "### run Python test case ###"
-  cd $current_dir/pytest
+
+  cd $tests_dir
+  IN_TDINTERNAL="community"
+
+  if [[ "$tests_dir" == *"$IN_TDINTERNAL"* ]]; then
+    cd ../..
+  else
+    cd ../
+  fi
+
+  TOP_DIR=`pwd`
+  TAOSLIB_DIR=`find . -name "libtaos.so"|grep -w lib|head -n1`
+  if [[ "$TAOSLIB_DIR" == *"$IN_TDINTERNAL"* ]]; then
+    LIB_DIR=`find . -name "libtaos.so"|grep -w lib|head -n1|cut -d '/' --fields=2,3,4,5`
+  else
+    LIB_DIR=`find . -name "libtaos.so"|grep -w lib|head -n1|cut -d '/' --fields=2,3,4`
+  fi
+
+  export LD_LIBRARY_PATH=$TOP_DIR/$LIB_DIR:$LD_LIBRARY_PATH
+
+  cd $tests_dir/pytest
 
   [ -f pytest-out.log ] && rm -f pytest-out.log
 
@@ -81,15 +115,15 @@ if [ "$2" != "sim" ]; then
     echo "### run Python smoke test ###"
     runPyCaseOneByOne smoketest.sh
   fi
-  totalPySuccess=`grep 'successfully executed' pytest-out.log | wc -l`
+  totalPySuccess=`grep 'success' pytest-out.log | wc -l`
 
   if [ "$totalPySuccess" -gt "0" ]; then
-    echo -e "${GREEN} ### Total $totalPySuccess python case(s) succeed! ### ${NC}"
+    echo -e "\n${GREEN} ### Total $totalPySuccess python case(s) succeed! ### ${NC}"
   fi
 
   totalPyFailed=`grep 'failed\|fault' pytest-out.log | wc -l`
   if [ "$totalPyFailed" -ne "0" ]; then
-    echo -e "${RED} ### Total $totalPyFailed python case(s) failed! ### ${NC}"
+    echo -e "\n${RED} ### Total $totalPyFailed python case(s) failed! ### ${NC}"
 #  exit $totalPyFailed
   fi
 fi