diff --git a/tests/script/basicSuite.sim b/tests/script/basicSuite.sim index d5892d8682e8ea0e7a074077a942cfa049cc0910..290472b15d33d2bc7422a13480e7e11016d235b6 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 fb924ac453ddd9bb1cb4526d3069add8bfac76b9..a8dfb0f21a03067f3348810485e37e3c6552995d 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 7701ca1c1fb5575d0fc6613b948b2bdbcd7a38fa..2afd6baf361379f4d729d60cb3cb39c10acfe7a1 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 fe4205824a16b86d3043ce6ba99dd3ada8547766..a873eb565442ce359d4a3a57403ff32b5bc2f50e 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