From 37b293720337b7cf443b4cec4e889b0dcabf9d64 Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sangshuduo@gmail.com>
Date: Thu, 9 Apr 2020 19:08:26 +0800
Subject: [PATCH] fix stop_dnodes.sh with postpone socket cleanup and same
 timestamp issue in general/table/basic2.sim.

---
 tests/script/basicSuite.sim           | 4 ++--
 tests/script/general/table/basic1.sim | 1 -
 tests/script/general/table/basic2.sim | 5 +++--
 tests/script/sh/stop_dnodes.sh        | 8 +++++---
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/tests/script/basicSuite.sim b/tests/script/basicSuite.sim
index d5892d8682..290472b15d 100644
--- a/tests/script/basicSuite.sim
+++ b/tests/script/basicSuite.sim
@@ -2,7 +2,7 @@
 
 
 run general/table/basic1.sim
-#run general/table/basic2.sim
-#run general/table/basic3.sim
+run general/table/basic2.sim
+run general/table/basic3.sim
 
 ################################## 
diff --git a/tests/script/general/table/basic1.sim b/tests/script/general/table/basic1.sim
index fb924ac453..a8dfb0f21a 100644
--- a/tests/script/general/table/basic1.sim
+++ b/tests/script/general/table/basic1.sim
@@ -1,6 +1,5 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system ifconfig
 system sh/exec.sh -n dnode1 -s start
 sql connect
 
diff --git a/tests/script/general/table/basic2.sim b/tests/script/general/table/basic2.sim
index 7701ca1c1f..2afd6baf36 100644
--- a/tests/script/general/table/basic2.sim
+++ b/tests/script/general/table/basic2.sim
@@ -43,11 +43,12 @@ sql_error insert into d1.n2 values(now, 1)
 
 print =============== insert data2
 sql insert into d1.n3 values(now, 1)
-sql insert into d1.n3 values(now, 2)
-sql insert into d1.n3 values(now, 3)
+sql insert into d1.n3 values(now+1s, 2)
+sql insert into d1.n3 values(now+2s, 3)
 
 print =============== query data
 sql select * from d1.n3
+print $rows
 if $rows != 3 then 
   return -1
 endi
diff --git a/tests/script/sh/stop_dnodes.sh b/tests/script/sh/stop_dnodes.sh
index fe4205824a..a873eb5654 100755
--- a/tests/script/sh/stop_dnodes.sh
+++ b/tests/script/sh/stop_dnodes.sh
@@ -7,7 +7,9 @@ if [ -n "$PID" ]; then
 fi
   
 PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
-if [ -n "$PID" ]; then 
+while [ -n "$PID" ]; do
 	echo sudo kill -9 $PID 
-	sudo pkill taosd
-fi 
+	sudo pkill -9 taosd
+  sudo fuser -k -n tcp 6030
+  PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+done
-- 
GitLab