From d7f0a598910c9ae25457c24f96e7c7b3fb7f785e Mon Sep 17 00:00:00 2001
From: Ping Xiao <pxiao@taosdata.com>
Date: Mon, 21 Sep 2020 19:00:27 +0800
Subject: [PATCH] [TD-1543]<test> adjust CI cases

---
 tests/perftest-scripts/coverage_test.sh | 2 +-
 tests/pytest/fulltest.sh                | 5 +++++
 tests/test-all.sh                       | 7 ++++---
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/tests/perftest-scripts/coverage_test.sh b/tests/perftest-scripts/coverage_test.sh
index a0c8fe4b3f..5085ec89d0 100755
--- a/tests/perftest-scripts/coverage_test.sh
+++ b/tests/perftest-scripts/coverage_test.sh
@@ -53,7 +53,7 @@ function buildTDengine {
 function runGeneralCaseOneByOne {
 	while read -r line; do
 		if [[ $line =~ ^./test.sh* ]]; then
-			case=`echo $line | grep -w "general\|unique\/mnode\/mgmt33.sim\|unique\/stable\/dnode3.sim\|unique\/cluster\/balance3.sim\|unique\/arbitrator\/offline_replica2_alterTable_online.sim"|awk '{print $NF}'`
+			case=`echo $line | grep sim$ |awk '{print $NF}'`
 
 			if [ -n "$case" ]; then
 				./test.sh -f $case > /dev/null 2>&1 && \
diff --git a/tests/pytest/fulltest.sh b/tests/pytest/fulltest.sh
index 9ebf1584e2..d4ffb6663f 100755
--- a/tests/pytest/fulltest.sh
+++ b/tests/pytest/fulltest.sh
@@ -192,3 +192,8 @@ python3 test.py -f query/queryInterval.py
 
 # tools
 python3 test.py -f tools/taosdemo.py
+
+# subscribe
+python3 test.py -f subscribe/singlemeter.py
+python3 test.py -f subscribe/stability.py
+python3 test.py -f subscribe/supertable.py
\ No newline at end of file
diff --git a/tests/test-all.sh b/tests/test-all.sh
index 275c6b1677..84b663809d 100755
--- a/tests/test-all.sh
+++ b/tests/test-all.sh
@@ -9,8 +9,9 @@ NC='\033[0m'
 
 function runSimCaseOneByOne {
   while read -r line; do
-    if [[ $line =~ ^run.* ]]; then
-      case=`echo $line | awk '{print $NF}'`
+    if [[ $line =~ ^./test.sh* ]]; then
+			case=`echo $line | grep sim$ |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 || \
@@ -54,7 +55,7 @@ if [ "$2" != "python" ]; then
     runSimCaseOneByOne regressionSuite.sim
   elif [ "$1" == "full" ]; then
     echo "### run TSIM full test ###"
-    runSimCaseOneByOne fullGeneralSuite.sim
+    runSimCaseOneByOne jenkins/basic.txt
   elif [ "$1" == "smoke" ] || [ -z "$1" ]; then
     echo "### run TSIM smoke test ###"
     runSimCaseOneByOne basicSuite.sim
-- 
GitLab