From 0701a7b5acf31f6fa2cbab2f0ad2ea13a552babd Mon Sep 17 00:00:00 2001
From: liuyq-617 <yqliu@taosdata.com>
Date: Tue, 17 Aug 2021 11:16:11 +0800
Subject: [PATCH] rebalance

---
 tests/pytest/test.py           |  3 +--
 tests/script/jenkins/basic.txt | 13 +++++++------
 tests/test-all.sh              |  3 +++
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/tests/pytest/test.py b/tests/pytest/test.py
index 65abd3ef93..97dca6be18 100644
--- a/tests/pytest/test.py
+++ b/tests/pytest/test.py
@@ -87,7 +87,7 @@ if __name__ == "__main__":
         else:
             toBeKilled = "valgrind.bin"
 
-        killCmd = "ps -ef|grep -w %s| grep -v grep | awk '{print $2}' | xargs kill -HUP > /dev/null 2>&1" % toBeKilled
+        killCmd = "ps -ef|grep -w %s| grep -v grep | awk '{print $2}' | xargs kill -TERM > /dev/null 2>&1" % toBeKilled
 
         psCmd = "ps -ef|grep -w %s| grep -v grep | awk '{print $2}'" % toBeKilled
         processID = subprocess.check_output(psCmd, shell=True)
@@ -110,7 +110,6 @@ if __name__ == "__main__":
             time.sleep(2)
 
         tdLog.info('stop All dnodes')
-        sys.exit(0)
     
     tdDnodes.init(deployPath)
     tdDnodes.setTestCluster(testCluster)
diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt
index 6ad6a74eed..b087c734f3 100644
--- a/tests/script/jenkins/basic.txt
+++ b/tests/script/jenkins/basic.txt
@@ -134,6 +134,13 @@ cd ../../../debug; make
 
 ./test.sh -f unique/cluster/alter.sim
 ./test.sh -f unique/cluster/cache.sim
+./test.sh -f unique/http/admin.sim
+./test.sh -f unique/http/opentsdb.sim
+
+./test.sh -f unique/import/replica2.sim
+./test.sh -f unique/import/replica3.sim
+
+./test.sh -f general/alter/cached_schema_after_alter.sim
 
 
 #======================b2-end===============
@@ -198,13 +205,7 @@ cd ../../../debug; make
 #======================b3-end===============
 #======================b4-start===============
 
-./test.sh -f unique/http/admin.sim
-./test.sh -f unique/http/opentsdb.sim
 
-./test.sh -f unique/import/replica2.sim
-./test.sh -f unique/import/replica3.sim
-
-./test.sh -f general/alter/cached_schema_after_alter.sim
 ./test.sh -f general/alter/count.sim
 ./test.sh -f general/alter/dnode.sim
 ./test.sh -f general/alter/import.sim
diff --git a/tests/test-all.sh b/tests/test-all.sh
index 8dd1ade9be..fb5b5c4830 100755
--- a/tests/test-all.sh
+++ b/tests/test-all.sh
@@ -179,6 +179,9 @@ function runPyCaseOneByOnefq() {
         start_time=`date +%s`
         date +%F\ %T | tee -a pytest-out.log
         echo -n $case
+        if [[ $1 =~ full ]] ; then
+          line=$line" -s"
+        fi
         $line > case.log 2>&1 && \
           echo -e "${GREEN} success${NC}" | tee -a pytest-out.log || \
           echo -e "${RED} failed${NC}" | tee -a pytest-out.log