From c2e4807a93fac7fe90569edf9842c90fc0fcfbc4 Mon Sep 17 00:00:00 2001 From: tomchon Date: Fri, 29 Jul 2022 09:51:35 +0800 Subject: [PATCH] test: modify testcases of muti-mnodes --- tests/pytest/util/dnodes.py | 8 ++++---- tests/system-test/fulltest.sh | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/pytest/util/dnodes.py b/tests/pytest/util/dnodes.py index 46af61d474..20e4e4abe6 100644 --- a/tests/pytest/util/dnodes.py +++ b/tests/pytest/util/dnodes.py @@ -489,7 +489,7 @@ class TDDnode: onlyKillOnceWindows = 0 while(processID): if not platform.system().lower() == 'windows' or (onlyKillOnceWindows == 0 and platform.system().lower() == 'windows'): - killCmd = "kill -4 %s > /dev/null 2>&1" % processID + killCmd = "kill -INT %s > /dev/null 2>&1" % processID os.system(killCmd) onlyKillOnceWindows = 1 time.sleep(1) @@ -503,7 +503,7 @@ class TDDnode: time.sleep(2) self.running = 0 - tdLog.debug("dnode:%d is stopped by kill -4" % (self.index)) + tdLog.debug("dnode:%d is stopped by kill -INT" % (self.index)) def stoptaosd(self): @@ -527,7 +527,7 @@ class TDDnode: onlyKillOnceWindows = 0 while(processID): if not platform.system().lower() == 'windows' or (onlyKillOnceWindows == 0 and platform.system().lower() == 'windows'): - killCmd = "kill -4 %s > /dev/null 2>&1" % processID + killCmd = "kill -INT %s > /dev/null 2>&1" % processID os.system(killCmd) onlyKillOnceWindows = 1 time.sleep(1) @@ -537,7 +537,7 @@ class TDDnode: time.sleep(2) self.running = 0 - tdLog.debug("dnode:%d is stopped by kill -4" % (self.index)) + tdLog.debug("dnode:%d is stopped by kill -INT" % (self.index)) def forcestop(self): if (not self.remoteIP == ""): diff --git a/tests/system-test/fulltest.sh b/tests/system-test/fulltest.sh index 7a0447cd6c..458951b815 100755 --- a/tests/system-test/fulltest.sh +++ b/tests/system-test/fulltest.sh @@ -175,7 +175,7 @@ python3 ./test.py -f 6-cluster/5dnode3mnodeSep1VnodeStopDnodeCreateDb.py -N 5 -M # python3 ./test.py -f 6-cluster/5dnode3mnodeSep1VnodeStopMnodeCreateDb.py -N 5 -M 3 python3 ./test.py -f 6-cluster/5dnode3mnodeSep1VnodeStopVnodeCreateDb.py -N 5 -M 3 -# python3 ./test.py -f 6-cluster/5dnode3mnodeSep1VnodeStopDnodeCreateStb.py -N 5 -M 3 +python3 ./test.py -f 6-cluster/5dnode3mnodeSep1VnodeStopDnodeCreateStb.py -N 5 -M 3 python3 ./test.py -f 6-cluster/5dnode3mnodeSep1VnodeStopMnodeCreateStb.py -N 5 -M 3 python3 ./test.py -f 6-cluster/5dnode3mnodeSep1VnodeStopVnodeCreateStb.py -N 5 -M 3