From 8e1789dc3e70fce1e1e4026d39e8fd6b5f4afece Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Sun, 27 Nov 2022 10:23:40 +0800 Subject: [PATCH 1/3] test: add asan case --- tests/parallel_test/cases.task | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task index 00c4af3124..393dc52d48 100644 --- a/tests/parallel_test/cases.task +++ b/tests/parallel_test/cases.task @@ -726,7 +726,7 @@ ,,,system-test,python3 ./test.py -f 7-tmq/tmq_taosx.py ,,,system-test,python3 ./test.py -f 7-tmq/stbTagFilter-multiCtb.py ,,y,system-test,./pytest.sh python3 ./test.py -f 99-TDcase/TD-19201.py -,,,system-test,python3 ./test.py -f 7-tmq/tmqSubscribeStb-r3.py -N 5 +,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/tmqSubscribeStb-r3.py -N 5 ,,,system-test,python3 ./test.py -f 7-tmq/tmq3mnodeSwitch.py -N 6 -M 3 ,,,system-test,python3 ./test.py -f 7-tmq/tmq3mnodeSwitch.py -N 6 -M 3 -n 3 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/between.py -Q 2 From 8e746d7daef8c00a30eb76876a48385698b86bf2 Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Sun, 27 Nov 2022 12:23:53 +0800 Subject: [PATCH 2/3] fix: disable taos-tools cunit test on windows (#18484) * chore(release): make get_os.sh works on mac * chore(tools): update taos-tools * chore: update taos-tools for 3.0 * fix: taosbenchmark with taosws on windows * fix: shell depends on ws on windows * fix: update taostools aa0923e for 3.0 * fix: taosdump for mac with websocket is wip * fix: update taostoosl c6f6220 for 3.0 * fix: update taos-tools 5a0a7cc * fix: update taos-tools 7a5e508 * fix: update taos-tools 2eb88c0 * fix: update taos tools c2da035 * fix: update taos-tools 2f560b4 * fix: update taos-tools 625a4cf * fix: update taos-tools af4c189 * fix: update taos-tools 872907c * fix: update taostools 540175c --- cmake/taostools_CMakeLists.txt.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/taostools_CMakeLists.txt.in b/cmake/taostools_CMakeLists.txt.in index 78aaa7f936..30e7b85495 100644 --- a/cmake/taostools_CMakeLists.txt.in +++ b/cmake/taostools_CMakeLists.txt.in @@ -2,7 +2,7 @@ # taos-tools ExternalProject_Add(taos-tools GIT_REPOSITORY https://github.com/taosdata/taos-tools.git - GIT_TAG cf0a640 + GIT_TAG 4cbb9ac SOURCE_DIR "${TD_SOURCE_DIR}/tools/taos-tools" BINARY_DIR "" #BUILD_IN_SOURCE TRUE From 8d1b036253c0a205a22cbf75b82e183e20e250c8 Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Sun, 27 Nov 2022 14:47:40 +0800 Subject: [PATCH 3/3] test: adjust case for asan mode --- tests/parallel_test/cases.task | 8 ++++---- tests/script/sh/stop_dnodes.sh | 20 +++++++++++++++++--- tests/system-test/7-tmq/subscribeDb3.py | 4 ++-- tests/system-test/7-tmq/tmqError.py | 2 +- 4 files changed, 24 insertions(+), 10 deletions(-) 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 ...... ")