diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task index cecaaef1d09bf591cba37f07856e0c47a67ccc6e..6eb3fb29f21340c542e9dd75542dc0f7fc35a28a 100644 --- a/tests/parallel_test/cases.task +++ b/tests/parallel_test/cases.task @@ -690,16 +690,16 @@ ,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/tmqCheckData.py ,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/tmqCheckData1.py ,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/tmqConsumerGroup.py -,,,system-test,python3 ./test.py -f 7-tmq/tmqShow.py +,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/tmqShow.py ,,,system-test,python3 ./test.py -f 7-tmq/tmqAlterSchema.py -,,,system-test,python3 ./test.py -f 7-tmq/tmqConsFromTsdb.py -,,,system-test,python3 ./test.py -f 7-tmq/tmqConsFromTsdb1.py -,,,system-test,python3 ./test.py -f 7-tmq/tmqConsFromTsdb-mutilVg.py -,,,system-test,python3 ./test.py -f 7-tmq/tmqConsFromTsdb1-mutilVg.py -,,,system-test,python3 ./test.py -f 7-tmq/tmqConsFromTsdb-1ctb.py -,,,system-test,python3 ./test.py -f 7-tmq/tmqConsFromTsdb1-1ctb.py -,,,system-test,python3 ./test.py -f 7-tmq/tmqConsFromTsdb-1ctb-funcNFilter.py -,,,system-test,python3 ./test.py -f 7-tmq/tmqConsFromTsdb-mutilVg-mutilCtb-funcNFilter.py +,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/tmqConsFromTsdb.py +,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/tmqConsFromTsdb1.py +,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/tmqConsFromTsdb-mutilVg.py +,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/tmqConsFromTsdb1-mutilVg.py +,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/tmqConsFromTsdb-1ctb.py +,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/tmqConsFromTsdb1-1ctb.py +,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/tmqConsFromTsdb-1ctb-funcNFilter.py +,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/tmqConsFromTsdb-mutilVg-mutilCtb-funcNFilter.py ,,,system-test,python3 ./test.py -f 7-tmq/tmqConsFromTsdb-mutilVg-mutilCtb.py ,,,system-test,python3 ./test.py -f 7-tmq/tmqConsFromTsdb1-1ctb-funcNFilter.py ,,,system-test,python3 ./test.py -f 7-tmq/tmqConsFromTsdb1-mutilVg-mutilCtb-funcNFilter.py diff --git a/tests/pytest/util/common.py b/tests/pytest/util/common.py index 9ffebcbdad5f0fa07e26f1bb4d249643ab7bbe42..5b73989d6f22b25c056cba802328d8e3d583ef87 100644 --- a/tests/pytest/util/common.py +++ b/tests/pytest/util/common.py @@ -737,7 +737,7 @@ class TDCom: if (platform.system().lower() == 'windows'): os.system("TASKKILL /F /IM %s.exe"%processorName) else: - os.system('pkill %s'%processorName) + os.system("unset LD_PRELOAD; pkill %s " % processorName) def is_json(msg): diff --git a/tests/system-test/7-tmq/tmqShow.py b/tests/system-test/7-tmq/tmqShow.py index 8ec5e62ad949edd53b366df3d12088459258bf1f..31ddc1b0f831df5d6e10f4337536488ddeaa892e 100644 --- a/tests/system-test/7-tmq/tmqShow.py +++ b/tests/system-test/7-tmq/tmqShow.py @@ -126,14 +126,21 @@ class TDTestCase: pThread = tmqCom.asyncInsertData(paraDict) tmqCom.getStartConsumeNotifyFromTmqsim() - #time.sleep(5) - tdLog.info("check show consumers") - tdSql.query("show consumers") - # tdLog.info(tdSql.queryResult) - rows = tdSql.getRows() - tdLog.info("show consumers rows: %d"%rows) - if rows != len(topicNameList): - tdLog.exit("show consumers rows error") + + for i in range(0, 10, 1): + tdLog.info("check show consumers") + tdSql.query("show consumers") + # tdLog.info(tdSql.queryResult) + rows = tdSql.getRows() + tdLog.info("show consumers rows: %d" % rows) + + if rows == len(topicNameList): + tdLog.info("show consumers rows not match %d:%d" % + (rows, len(topicNameList))) + time.sleep(1) + break + if (rows == 9): + tdLog.exit("show consumers rows error") for i in range(0, 10, 1): tdLog.info("check show subscriptions")