From 686c821e4541945e3621662cb72af7cf6ce677f4 Mon Sep 17 00:00:00 2001 From: chenhaoran Date: Thu, 14 Sep 2023 11:41:50 +0800 Subject: [PATCH 1/3] test:increase timeout of win testcase --- tests/script/wtest.bat | 2 +- tests/system-test/6-cluster/5dnode3mnodeRecreateMnode.py | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/script/wtest.bat b/tests/script/wtest.bat index 88ae703b7c..7321dbfd05 100644 --- 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 index 650bc347aa..7af5982dec 100644 --- a/tests/system-test/6-cluster/5dnode3mnodeRecreateMnode.py +++ b/tests/system-test/6-cluster/5dnode3mnodeRecreateMnode.py @@ -166,22 +166,23 @@ class TDTestCase: 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): From 36a1cac3503b4fe3425c136dc535ca8667e0e018 Mon Sep 17 00:00:00 2001 From: chenhaoran Date: Thu, 14 Sep 2023 16:03:50 +0800 Subject: [PATCH 2/3] test:set mixed deployment of mnode and vnode in testpy --- tests/parallel_test/cases.task | 8 ++++---- tests/system-test/test.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task index ea2c9d468e..3aa02275e5 100644 --- a/tests/parallel_test/cases.task +++ b/tests/parallel_test/cases.task @@ -157,8 +157,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 @@ -821,7 +821,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 @@ -835,7 +835,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/system-test/test.py b/tests/system-test/test.py index e0dc426004..aee7138d46 100644 --- a/tests/system-test/test.py +++ b/tests/system-test/test.py @@ -109,7 +109,7 @@ if __name__ == "__main__": 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 @@ if __name__ == "__main__": createDnodeNums = value if key in ['-i', '--independentMnode']: - independentMnode = False + independentMnode = True if key in ['-R', '--restful']: restful = True From 0edcba03513ff43bda4b954ed5cce27cd6e25771 Mon Sep 17 00:00:00 2001 From: chenhaoran Date: Thu, 14 Sep 2023 18:21:00 +0800 Subject: [PATCH 3/3] test:set mixed deployment of mnode and vnode in testpy --- tests/system-test/test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/system-test/test.py b/tests/system-test/test.py index aee7138d46..6813530a5c 100644 --- a/tests/system-test/test.py +++ b/tests/system-test/test.py @@ -202,7 +202,7 @@ if __name__ == "__main__": createDnodeNums = value if key in ['-i', '--independentMnode']: - independentMnode = True + independentMnode = value if key in ['-R', '--restful']: restful = True