diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task index 393dc52d48..e7e273bc9f 100644 --- a/tests/parallel_test/cases.task +++ b/tests/parallel_test/cases.task @@ -675,16 +675,16 @@ ,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/subscribeDb0.py ,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/subscribeDb1.py ,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/subscribeDb2.py -,,,system-test,python3 ./test.py -f 7-tmq/subscribeDb3.py -,,,system-test,python3 ./test.py -f 7-tmq/subscribeDb4.py +,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/subscribeDb3.py +,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/subscribeDb4.py ,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/subscribeStb.py ,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/subscribeStb0.py ,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/subscribeStb1.py ,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/subscribeStb2.py -,,,system-test,python3 ./test.py -f 7-tmq/subscribeStb3.py +,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/subscribeStb3.py ,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/subscribeStb4.py ,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/db.py -,,n,system-test,python3 ./test.py -f 7-tmq/tmqError.py +,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/tmqError.py ,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/schema.py ,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/stbFilter.py ,,,system-test,python3 ./test.py -f 7-tmq/tmqCheckData.py diff --git a/tests/script/sh/stop_dnodes.sh b/tests/script/sh/stop_dnodes.sh index ab9cfc1017..c63d6daf8a 100755 --- a/tests/script/sh/stop_dnodes.sh +++ b/tests/script/sh/stop_dnodes.sh @@ -30,13 +30,27 @@ done PID=`ps -ef|grep -w taos | grep -v grep | awk '{print $2}'` while [ -n "$PID" ]; do echo kill -9 $PID - #pkill -9 taosd + #pkill -9 taos kill -9 $PID - echo "Killing taosd processes" + echo "Killing taos processes" if [ "$OS_TYPE" != "Darwin" ]; then fuser -k -n tcp 6030 else lsof -nti:6030 | xargs kill -9 fi - PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'` + PID=`ps -ef|grep -w taos | grep -v grep | awk '{print $2}'` +done + +PID=`ps -ef|grep -w tmq_sim | grep -v grep | awk '{print $2}'` +while [ -n "$PID" ]; do + echo kill -9 $PID + #pkill -9 tmq_sim + kill -9 $PID + echo "Killing tmq_sim processes" + if [ "$OS_TYPE" != "Darwin" ]; then + fuser -k -n tcp 6030 + else + lsof -nti:6030 | xargs kill -9 + fi + PID=`ps -ef|grep -w tmq_sim | grep -v grep | awk '{print $2}'` done diff --git a/tests/system-test/7-tmq/subscribeDb3.py b/tests/system-test/7-tmq/subscribeDb3.py index 819588badc..747ea3ba86 100644 --- a/tests/system-test/7-tmq/subscribeDb3.py +++ b/tests/system-test/7-tmq/subscribeDb3.py @@ -238,7 +238,7 @@ class TDTestCase: if (platform.system().lower() == 'windows'): os.system("TASKKILL /F /IM tmq_sim.exe") else: - os.system('pkill tmq_sim') + os.system('unset LD_PRELOAD; pkill tmq_sim') expectRows = 0 resultList = self.selectConsumeResult(expectRows) @@ -316,7 +316,7 @@ class TDTestCase: if (platform.system().lower() == 'windows'): os.system("TASKKILL /F /IM tmq_sim.exe") else: - os.system('pkill tmq_sim') + os.system('unset LD_PRELOAD; pkill tmq_sim') # expectRows = 0 # resultList = self.selectConsumeResult(expectRows) diff --git a/tests/system-test/7-tmq/tmqError.py b/tests/system-test/7-tmq/tmqError.py index 164e7f1c8c..a39bac8dd1 100644 --- a/tests/system-test/7-tmq/tmqError.py +++ b/tests/system-test/7-tmq/tmqError.py @@ -313,7 +313,7 @@ class TDTestCase: if (platform.system().lower() == 'windows'): os.system("TASKKILL /F /IM tmq_sim.exe") else: - os.system('pkill tmq_sim') + os.system('unset LD_PRELOAD; pkill tmq_sim') tdLog.printNoPrefix("======== test case 1 end ...... ")