Merge pull request #22499 from taosdata/test/TD-25838

test:kill tmq_sim process when start cases in windows

tests/parallel_test/split_case.sh

@@ -5,8 +5,10 @@ parm_path=$(pwd ${parm_path})
 echo "execute path:${parm_path}"
 cd ${parm_path}
 cp cases.task  ${case_file}
+# comment udf and stream case in windows
 sed -i '/udf/d' ${case_file}
 sed -i '/Udf/d' ${case_file}
+sed -i '/stream/d' ${case_file}
 sed -i '/^$/d' ${case_file} 
 sed -i '$a\%%FINISHED%%' ${case_file} 
 

tests/pytest/util/dnodes.py

@@ -812,6 +812,15 @@ class TDDnodes:
                 time.sleep(1)
                 processID = subprocess.check_output(
                     psCmd, shell=True).decode("utf-8").strip()
+            psCmd = "for /f %a in ('wmic process where \"name='tmq_sim'\" get processId ^| xargs echo ^| awk '{print $2}' ^&^& echo aa') do @(ps | grep %a | awk '{print $1}' | xargs)"
+            processID = subprocess.check_output(psCmd, shell=True).decode("utf-8").strip()
+            while(processID):
+                print(processID)
+                killCmd = "kill -9 %s > nul 2>&1" % processID
+                os.system(killCmd)
+                time.sleep(1)
+                processID = subprocess.check_output(
+                    psCmd, shell=True).decode("utf-8").strip()
         else:
             psCmd = "ps -ef | grep -w taosd | grep 'root' | grep -v grep| grep -v defunct | awk '{print $2}' | xargs"
             processID = subprocess.check_output(psCmd, shell=True).decode("utf-8").strip()

tests/script/win-test-file

@@ -26,8 +26,10 @@
 ./test.sh -f tsim/user/basic.sim
 ./test.sh -f tsim/user/password.sim
 ./test.sh -f tsim/user/privilege_db.sim
+./test.sh -f tsim/user/privilege_sysinfo.sim
 ./test.sh -f tsim/user/privilege_topic.sim
 ./test.sh -f tsim/user/privilege_table.sim
+./test.sh -f tsim/user/privilege_create_db.sim
 ./test.sh -f tsim/db/alter_option.sim
 ./test.sh -f tsim/db/alter_replica_31.sim
 ./test.sh -f tsim/db/basic1.sim
@@ -183,6 +185,7 @@
 ./test.sh -f tsim/query/scalarNull.sim
 ./test.sh -f tsim/query/session.sim
 ./test.sh -f tsim/query/join_interval.sim
+./test.sh -f tsim/query/join_pk.sim
 ./test.sh -f tsim/query/unionall_as_table.sim
 ./test.sh -f tsim/query/multi_order_by.sim
 ./test.sh -f tsim/query/sys_tbname.sim
@@ -197,6 +200,7 @@
 ./test.sh -f tsim/query/tag_scan.sim
 ./test.sh -f tsim/query/nullColSma.sim
 ./test.sh -f tsim/query/bug3398.sim
+./test.sh -f tsim/query/explain_tsorder.sim
 ./test.sh -f tsim/qnode/basic1.sim
 ./test.sh -f tsim/snode/basic1.sim
 ./test.sh -f tsim/mnode/basic1.sim
@@ -233,51 +237,6 @@
 ./test.sh -f tsim/table/table.sim
 ./test.sh -f tsim/table/tinyint.sim
 ./test.sh -f tsim/table/vgroup.sim
-./test.sh -f tsim/stream/basic0.sim -g
-./test.sh -f tsim/stream/basic1.sim
-./test.sh -f tsim/stream/basic2.sim
-./test.sh -f tsim/stream/basic3.sim
-./test.sh -f tsim/stream/basic4.sim
-./test.sh -f tsim/stream/checkStreamSTable1.sim
-./test.sh -f tsim/stream/checkStreamSTable.sim
-./test.sh -f tsim/stream/deleteInterval.sim
-./test.sh -f tsim/stream/deleteSession.sim
-./test.sh -f tsim/stream/deleteState.sim
-./test.sh -f tsim/stream/distributeInterval0.sim
-./test.sh -f tsim/stream/distributeIntervalRetrive0.sim
-./test.sh -f tsim/stream/distributeSession0.sim
-./test.sh -f tsim/stream/drop_stream.sim
-./test.sh -f tsim/stream/fillHistoryBasic1.sim
-./test.sh -f tsim/stream/fillHistoryBasic2.sim
-./test.sh -f tsim/stream/fillHistoryBasic3.sim
-./test.sh -f tsim/stream/fillIntervalDelete0.sim
-./test.sh -f tsim/stream/fillIntervalDelete1.sim
-./test.sh -f tsim/stream/fillIntervalLinear.sim
-./test.sh -f tsim/stream/fillIntervalPartitionBy.sim
-./test.sh -f tsim/stream/fillIntervalPrevNext1.sim
-./test.sh -f tsim/stream/fillIntervalPrevNext.sim
-./test.sh -f tsim/stream/fillIntervalRange.sim
-./test.sh -f tsim/stream/fillIntervalValue.sim
-./test.sh -f tsim/stream/ignoreCheckUpdate.sim
-./test.sh -f tsim/stream/ignoreExpiredData.sim
-./test.sh -f tsim/stream/partitionby1.sim
-./test.sh -f tsim/stream/partitionbyColumnInterval.sim
-./test.sh -f tsim/stream/partitionbyColumnSession.sim
-./test.sh -f tsim/stream/partitionbyColumnState.sim
-./test.sh -f tsim/stream/partitionby.sim
-./test.sh -f tsim/stream/pauseAndResume.sim
-./test.sh -f tsim/stream/schedSnode.sim
-./test.sh -f tsim/stream/session0.sim
-./test.sh -f tsim/stream/session1.sim
-./test.sh -f tsim/stream/sliding.sim
-./test.sh -f tsim/stream/state0.sim
-./test.sh -f tsim/stream/state1.sim
-./test.sh -f tsim/stream/triggerInterval0.sim
-./test.sh -f tsim/stream/triggerSession0.sim
-./test.sh -f tsim/stream/udTableAndTag0.sim
-./test.sh -f tsim/stream/udTableAndTag1.sim
-./test.sh -f tsim/stream/udTableAndTag2.sim
-./test.sh -f tsim/stream/windowClose.sim
 ./test.sh -f tsim/trans/lossdata1.sim
 ./test.sh -f tsim/tmq/basic1.sim
 ./test.sh -f tsim/tmq/basic2.sim

tests/system-test/test.py

@@ -553,6 +553,7 @@ if __name__ == "__main__":
         else :
             # dnode > 1 cluster
             tdLog.debug("create an cluster  with %s nodes and make %s dnode as independent mnode"%(dnodeNums,mnodeNums))
+            print(independentMnode,"independentMnode valuse")
             dnodeslist = cluster.configure_cluster(dnodeNums=dnodeNums, mnodeNums=mnodeNums, independentMnode=independentMnode)
             tdDnodes = ClusterDnodes(dnodeslist)
             tdDnodes.init(deployPath, masterIp)

tests/system-test/win-test-file

@@ -17,6 +17,7 @@ python3 ./test.py -f 2-query/nestedQuery_str.py -Q 4
 python3 ./test.py -f 2-query/nestedQuery_math.py -Q 4
 python3 ./test.py -f 2-query/nestedQuery_time.py -Q 4
 python3 ./test.py -f 2-query/nestedQuery_26.py -Q 4
+python3 ./test.py -f 2-query/interval_limit_opt.py -Q 4
 python3 ./test.py -f 7-tmq/tmqShow.py
 python3 ./test.py -f 7-tmq/tmqDropStb.py
 python3 ./test.py -f 7-tmq/subscribeStb0.py
@@ -133,6 +134,8 @@ python3 ./test.py -f 0-others/sysinfo.py
 python3 ./test.py -f 0-others/user_control.py
 python3 ./test.py -f 0-others/user_manage.py
 python3 ./test.py -f 0-others/user_privilege.py
+python3 ./test.py -f 0-others/user_privilege_show.py
+python3 ./test.py -f 0-others/user_privilege_all.py
 python3 ./test.py -f 0-others/fsync.py
 python3 ./test.py -f 0-others/multilevel.py
 python3 ./test.py -f 0-others/compatibility.py
@@ -421,6 +424,7 @@ python3 ./test.py -f 6-cluster/5dnode3mnodeRestartDnodeInsertData.py -N 6 -M 3
 python3 ./test.py -f 6-cluster/5dnode3mnodeRestartDnodeInsertData.py -N 6 -M 3 -n 3
 python3 ./test.py -f 6-cluster/5dnode3mnodeRestartDnodeInsertDataAsync.py -N 6 -M 3
 python3 ./test.py -f 6-cluster/manually-test/6dnode3mnodeInsertLessDataAlterRep3to1to3.py -N 6 -M 3
+python3 ./test.py -f 6-cluster/5dnode3mnodeRoll.py -N 3 -C 1
 python3 ./test.py -f 6-cluster/5dnode3mnodeAdd1Ddnoe.py -N 7 -M 3 -C 6
 python3 ./test.py -f 6-cluster/5dnode3mnodeAdd1Ddnoe.py -N 7 -M 3 -C 6 -n 3
 python3 ./test.py -f 6-cluster/5dnode3mnodeRecreateMnode.py -N 6 -M 3