Merge pull request #22905 from taosdata/test/main/TD-26290

test:increase timeout of win testcase
taosdata · Sep 15, 2023 · 583f4fa · 583f4fa
2 parents 500fcad + b594393
commit 583f4fa
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task
@@ -156,8 +156,8 @@
 ,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/raw_block_interface_test.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/stbTagFilter-multiCtb.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/tmqSubscribeStb-r3.py -N 5
-,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/tmq3mnodeSwitch.py -N 6 -M 3 
-,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/tmq3mnodeSwitch.py -N 6 -M 3 -n 3 
+,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/tmq3mnodeSwitch.py -N 6 -M 3 -i True
+,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/tmq3mnodeSwitch.py -N 6 -M 3 -n 3 -i True
 ,,y,system-test,./pytest.sh python3 ./test.py -f 99-TDcase/TD-19201.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 99-TDcase/TD-21561.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 99-TDcase/TS-3404.py
@@ -818,7 +818,7 @@
 ,,y,script,./test.sh -f tsim/dnode/balance3.sim
 ,,y,script,./test.sh -f tsim/vnode/replica3_many.sim
 ,,y,script,./test.sh -f tsim/stable/metrics_idx.sim
-,,y,script,./test.sh -f tsim/db/alter_replica_13.sim
+# ,,y,script,./test.sh -f tsim/db/alter_replica_13.sim
 ,,y,script,./test.sh -f tsim/sync/3Replica1VgElect.sim
 ,,y,script,./test.sh -f tsim/sync/3Replica5VgElect.sim
 ,,n,script,./test.sh -f tsim/valgrind/checkError6.sim
@@ -831,7 +831,7 @@
 ,,y,script,./test.sh -f tsim/user/privilege_table.sim
 ,,y,script,./test.sh -f tsim/user/privilege_create_db.sim
 ,,y,script,./test.sh -f tsim/db/alter_option.sim
-,,y,script,./test.sh -f tsim/db/alter_replica_31.sim
+# ,,y,script,./test.sh -f tsim/db/alter_replica_31.sim
 ,,y,script,./test.sh -f tsim/db/basic1.sim
 ,,y,script,./test.sh -f tsim/db/basic2.sim
 ,,y,script,./test.sh -f tsim/db/basic3.sim

diff --git a/tests/script/wtest.bat b/tests/script/wtest.bat
@@ -67,7 +67,7 @@ set "FILE_NAME=testSuite.sim"
 if "%1" == "-f" set "FILE_NAME=%2"
 set FILE_NAME=%FILE_NAME:/=\%
 
-start cmd /k "timeout /t 600 /NOBREAK && taskkill /f /im tsim.exe & exit /b"
+start cmd /k "timeout /t 800 /NOBREAK && taskkill /f /im tsim.exe & exit /b"
 
 rem echo FILE_NAME:  %FILE_NAME%
 echo ExcuteCmd:  %tsim% -c %CFG_DIR% -f %FILE_NAME%

diff --git a/tests/system-test/6-cluster/5dnode3mnodeRecreateMnode.py b/tests/system-test/6-cluster/5dnode3mnodeRecreateMnode.py
@@ -166,22 +166,23 @@ def fiveDnodeThreeMnode(self,dnodeNumbers,mnodeNums,restartNumbers,stopRole):
             nodePort = 6030 + i*100
             newTdSql=tdCom.newTdSql(port=nodePort)
 
+
+        tdDnodes[1].stoptaosd()
+
         dataPath = tdDnodes[1].dataDir
         os.system(f"rm -rf {dataPath}/*")
         os.system(f"rm -rf {dataPath}/.runing")
 
-        tdDnodes[1].stoptaosd()
         tdDnodes[1].starttaosd()
         sleep(5)
         for i in range(6):
             nodePort = 6030 + i*100 
             newTdSql=tdCom.newTdSql(port=nodePort)
 
+        tdDnodes[0].stoptaosd()
         dataPath = tdDnodes[0].dataDir
         os.system(f"rm -rf {dataPath}/*")
         os.system(f"rm -rf {dataPath}/.runing")
-
-        tdDnodes[0].stoptaosd()
         tdDnodes[0].starttaosd()
         sleep(5)
         for i in range(6):

diff --git a/tests/system-test/test.py b/tests/system-test/test.py
@@ -109,7 +109,7 @@ def runOnPreviousCluster(host, config, fileName):
     websocket = False
     replicaVar = 1
     asan = False
-    independentMnode = True
+    independentMnode = False
     previousCluster = False
     opts, args = getopt.gnu_getopt(sys.argv[1:], 'f:p:m:l:scghrd:k:e:N:M:Q:C:RWD:n:i:aP', [
         'file=', 'path=', 'master', 'logSql', 'stop', 'cluster', 'valgrind', 'help', 'restart', 'updateCfgDict', 'killv', 'execCmd','dnodeNums','mnodeNums','queryPolicy','createDnodeNums','restful','websocket','adaptercfgupdate','replicaVar','independentMnode','previous'])
@@ -202,7 +202,7 @@ def runOnPreviousCluster(host, config, fileName):
             createDnodeNums = value
 
         if key in ['-i', '--independentMnode']:
-            independentMnode = False
+            independentMnode = value
 
         if key in ['-R', '--restful']:
             restful = True