Merge remote-tracking branch 'origin/develop' into feature/tsim

.travis.yml

@@ -49,7 +49,7 @@ matrix:
           ./test-all.sh $TRAVIS_EVENT_TYPE || travis_terminate $?
 
           cd ${TRAVIS_BUILD_DIR}/tests/pytest
-          ./smoketest.sh -g 2>&1 | tee mem-error-out.txt
+          ./valgrind-test.sh -g 2>&1 | tee mem-error-out.txt
           sleep 1
 
           # Color setting
@@ -163,11 +163,9 @@ matrix:
 
           cd ${TRAVIS_BUILD_DIR}/tests
 
-          ./test-all.sh
+          ./test-all.sh $TRAVIS_EVENT_TYPE
 
-          if [ "$?" -ne "0" ]; then
-            travis_terminate $?
-          fi
+          TEST_RESULT=$?
 
           pkill taosd
           sleep 1
@@ -199,6 +197,9 @@ matrix:
             echo -e "${RED} ## Codecov did not collect coverage report! ## ${NC} "
           fi
 
+          if [ "$TEST_RESULT" -ne "0" ]; then
+            travis_terminate $?
+          fi
           ;;
         esac
 

tests/pytest/smoketest.sh

@@ -29,88 +29,17 @@ python3 ./test.py $1 -s && sleep 1
 python3 ./test.py $1 -f table/db_table.py
 python3 ./test.py $1 -s && sleep 1
 
-python3 ./test.py $1 -f import_merge/importDataLastTO.py
-python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f import_merge/importDataLastT.py
-python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f import_merge/importDataTO.py
-python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f import_merge/importDataT.py
-python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f import_merge/importHeadOverlap.py
-python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f import_merge/importHeadPartOverlap.py
-python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f import_merge/importHORestart.py
-python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f import_merge/importHPORestart.py
-python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f import_merge/importHRestart.py
-python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f import_merge/importLastSub.py
-python3 ./test.py $1 -s && sleep 1
-
-python3 ./test.py $1 -f import_merge/importBlock1HO.py
-python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f import_merge/importBlock1HPO.py
-python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f import_merge/importBlock1H.py
-python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f import_merge/importBlock1S.py
-python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f import_merge/importBlock1Sub.py
-python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f import_merge/importBlock1TO.py
-python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f import_merge/importBlock1TPO.py
-python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f import_merge/importBlock1T.py
-python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f import_merge/importBlock2HO.py
-python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f import_merge/importBlock2HPO.py
-python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f import_merge/importBlock2H.py
-python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f import_merge/importBlock2S.py
-python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f import_merge/importBlock2Sub.py
-python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f import_merge/importBlock2TO.py
-python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f import_merge/importBlock2TPO.py
-python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f import_merge/importBlock2T.py
-python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f import_merge/importBlockbetween.py
-python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f import_merge/importCacheFileSub.py
-python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f import_merge/importCacheFileTO.py
-python3 ./test.py $1 -s && sleep 1
 python3 ./test.py $1 -f import_merge/importCacheFileT.py
 python3 ./test.py $1 -s && sleep 1
 python3 ./test.py $1 -f import_merge/importDataLastSub.py
 python3 ./test.py $1 -s && sleep 1
 python3 ./test.py $1 -f import_merge/importHead.py
 python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f import_merge/importLastTO.py
-python3 ./test.py $1 -s && sleep 1
 python3 ./test.py $1 -f import_merge/importLastT.py
 python3 ./test.py $1 -s && sleep 1
 python3 ./test.py $1 -f import_merge/importSpan.py
 python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f import_merge/importSRestart.py
-python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f import_merge/importSubRestart.py
-python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f import_merge/importTailOverlap.py
-python3 ./test.py $1 -s && sleep 1
 python3 ./test.py $1 -f import_merge/importTail.py
 python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f import_merge/importTORestart.py
-python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f import_merge/importTPORestart.py
-python3 ./test.py $1 -s && sleep 1
 python3 ./test.py $1 -f import_merge/importTRestart.py
 python3 ./test.py $1 -s && sleep 1

tests/pytest/util/dnodes.py

@@ -201,8 +201,8 @@ class TDDnode:
         self.running = 1
         tdLog.debug("dnode:%d is running with %s " % (self.index, cmd))
 
-        tdLog.debug("wait 2 seconds for the dnode:%d to start." % (self.index))
-        time.sleep(2)
+        tdLog.debug("wait 4 seconds for the dnode:%d to start." % (self.index))
+        time.sleep(4)
 
     def stop(self):
         if self.valgrind == 0:

tests/pytest/valgrind-test.sh

+#!/bin/bash
+python3 ./test.py $1 -f insert/basic.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f insert/int.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f insert/float.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f insert/bigint.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f insert/bool.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f insert/double.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f insert/smallint.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f insert/tinyint.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f insert/binary.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f insert/date.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f insert/nchar.py
+python3 ./test.py $1 -s && sleep 1
+
+python3 ./test.py $1 -f table/column_name.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f table/column_num.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f table/db_table.py
+python3 ./test.py $1 -s && sleep 1
+
+python3 ./test.py $1 -f import_merge/importCacheFileT.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f import_merge/importDataLastSub.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f import_merge/importHead.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f import_merge/importLastT.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f import_merge/importSpan.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f import_merge/importTail.py
+python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f import_merge/importTRestart.py
+python3 ./test.py $1 -s && sleep 1