From 24058f1d357185051912c6a7e154bbffeae55261 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Thu, 14 May 2020 19:05:20 +0800
Subject: [PATCH] scripts

---
 tests/script/general/db/delete.sim     |  6 ++++++
 tests/script/jenkins/basic.txt         |  2 +-
 tests/script/unique/db/delete.sim      | 17 +++++++++++------
 tests/script/unique/db/delete_part.sim | 14 +++++++++-----
 4 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/tests/script/general/db/delete.sim b/tests/script/general/db/delete.sim
index f86774c2cf..f95676088b 100644
--- a/tests/script/general/db/delete.sim
+++ b/tests/script/general/db/delete.sim
@@ -20,6 +20,12 @@ while $i < 2000
   $i = $i + 1
 endw 
 
+sql show db.vgroups
+if $rows != 2 then 
+  return -1
+endi 
+
+return
 print ======== step2
 sleep 1000
 sql drop database db
diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt
index 94c9c71edc..b86113eb51 100644
--- a/tests/script/jenkins/basic.txt
+++ b/tests/script/jenkins/basic.txt
@@ -49,7 +49,7 @@ cd ../../../debug; make
 ./test.sh -f general/db/basic3.sim
 ./test.sh -f general/db/basic4.sim
 ./test.sh -f general/db/basic5.sim
-./test.sh -f unique/db/delete.sim
+./test.sh -f general/db/delete.sim
 ./test.sh -f general/db/delete_reuse1.sim
 ./test.sh -f general/db/delete_reuse2.sim
 ./test.sh -f general/db/delete_reusevnode.sim
diff --git a/tests/script/unique/db/delete.sim b/tests/script/unique/db/delete.sim
index dcdd1ae9e9..0ae6a3c13c 100644
--- a/tests/script/unique/db/delete.sim
+++ b/tests/script/unique/db/delete.sim
@@ -34,6 +34,11 @@ while $i < 2000
   $i = $i + 1
 endw 
 
+sql show db.vgroups
+if $rows != 2 then 
+  return -1
+endi 
+
 print ======== step2
 sleep 1000
 sql drop database db
@@ -59,14 +64,14 @@ endi
 
 print ======== step3
 
-system sh/exec.sh -n dnode1 -s stop  -x SIGINT
-system sh/exec.sh -n dnode2 -s stop  -x SIGINT
-system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
 
 sleep 1000
-system sh/exec.sh -n dnode1 -s start -t
-system sh/exec.sh -n dnode2 -s start -t
-system sh/exec.sh -n dnode3 -s start -t
+system sh/exec_up.sh -n dnode1 -s start
+system sh/exec_up.sh -n dnode2 -s start
+system sh/exec_up.sh -n dnode3 -s start
 
 $x = 0
 step3: 
diff --git a/tests/script/unique/db/delete_part.sim b/tests/script/unique/db/delete_part.sim
index 3d1cc5dc63..7cf326e191 100644
--- a/tests/script/unique/db/delete_part.sim
+++ b/tests/script/unique/db/delete_part.sim
@@ -31,17 +31,17 @@ system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4
 
 print ========= start dnodes
 system sh/exec_up.sh -n dnode1 -s start
+sleep 3000
 sql connect
 sql create dnode $hostname2
 system sh/exec_up.sh -n dnode2 -s start
-sleep 3000
 
 $loop = 0
 begin:
 
     $db = db . $loop
 	
-	print ======== step1
+	print ======== step1 $loop
 	sql create database $db
 	sql use $db
 	
@@ -53,15 +53,16 @@ begin:
 	  $x = $x + 1
 	endw
 
-	print ======== step2
+	print ======== step2 $loop
 	system sh/exec_up.sh -n dnode2 -s stop
+	sleep 1000
 	sql drop database $db 
 
 	
-	print ======== step3
+	print ======== step3 $loop
 	sleep 3000
 	system sh/exec_up.sh -n dnode2 -s start
-	sleep 20000
+	sleep 5000
 	
 	print ===> test times : $loop
     if $loop > 5 then	  
@@ -69,6 +70,9 @@ begin:
 	endi
 
 	$loop = $loop + 1
+
+	sql reset query cache
+	sleep 1000
 	
 goto begin
   
-- 
GitLab