Merge pull request #1569 from taosdata/add-testcase-execution-in-ci

fix stop_dnodes.sh with postpone socket cleanup and same timestamp is…

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
 
 ################################## 

tests/script/general/table/basic1.sim

 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
 

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

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