From 3c5f07f70b542831b8e0ec834cd4ae70fb1e7742 Mon Sep 17 00:00:00 2001 From: Ping Xiao Date: Fri, 23 Dec 2022 10:32:19 +0800 Subject: [PATCH] test: add test cases --- .../taosbenchmark/auto_create_table_json.py | 2 ++ .../taosbenchmark/insert_alltypes_json.py | 1 + .../5-taos-tools/taosbenchmark/query_json.py | 2 +- tests/parallel_test/cases.task | 4 +-- tests/pytest/util/taosadapter.py | 14 +++++------ tests/system-test/2-query/db.py | 25 ++++++++++++++++--- 6 files changed, 34 insertions(+), 14 deletions(-) diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/auto_create_table_json.py b/tests/develop-test/5-taos-tools/taosbenchmark/auto_create_table_json.py index 4e3c9d07ce..a6167158a2 100644 --- a/tests/develop-test/5-taos-tools/taosbenchmark/auto_create_table_json.py +++ b/tests/develop-test/5-taos-tools/taosbenchmark/auto_create_table_json.py @@ -153,6 +153,8 @@ class TDTestCase: tdSql.query("select count(*) from db.`stb4-2`") tdSql.checkData(0, 0, 160) + tAdapter.stop() + def stop(self): tdSql.close() tdLog.success("%s successfully executed" % __file__) diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/insert_alltypes_json.py b/tests/develop-test/5-taos-tools/taosbenchmark/insert_alltypes_json.py index e63908ce33..080d6aea87 100644 --- a/tests/develop-test/5-taos-tools/taosbenchmark/insert_alltypes_json.py +++ b/tests/develop-test/5-taos-tools/taosbenchmark/insert_alltypes_json.py @@ -321,6 +321,7 @@ class TDTestCase: tdSql.query("select count(*) from db.stb where t13 like 'b1%' or t13 like 'b2%'") tdSql.checkData(0, 0, 160) + tAdapter.stop() def stop(self): tdSql.close() diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/query_json.py b/tests/develop-test/5-taos-tools/taosbenchmark/query_json.py index 375113c3ef..c4b1750340 100644 --- a/tests/develop-test/5-taos-tools/taosbenchmark/query_json.py +++ b/tests/develop-test/5-taos-tools/taosbenchmark/query_json.py @@ -116,7 +116,7 @@ class TDTestCase: assert times == 1, "result is %s != expect: 1" % times - + tAdapter.stop() def stop(self): diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task index 0f6ade4fbe..336cc60a0c 100644 --- a/tests/parallel_test/cases.task +++ b/tests/parallel_test/cases.task @@ -482,8 +482,8 @@ ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/count.py -R ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/countAlwaysReturnValue.py ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/countAlwaysReturnValue.py -R -,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/db.py -,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/db.py -R +,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/db.py +,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/db.py -N 3 -n 3 -R ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/diff.py ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/diff.py -R ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/distinct.py diff --git a/tests/pytest/util/taosadapter.py b/tests/pytest/util/taosadapter.py index 440c23dc65..7dd6226631 100644 --- a/tests/pytest/util/taosadapter.py +++ b/tests/pytest/util/taosadapter.py @@ -227,7 +227,7 @@ class TAdapter: time.sleep(0.1) def stop(self, force_kill=False): - signal = "-SIGKILL" if force_kill else "-SIGTERM" + signal = "-9" if force_kill else "-15" if self.remoteIP: self.remote_exec(self.taosadapter_cfg_dict, "tAdapter.running=1\ntAdapter.stop()") @@ -235,19 +235,17 @@ class TAdapter: return toBeKilled = "taosadapter" - + if self.running != 0: psCmd = f"ps -ef|grep -w {toBeKilled}| grep -v grep | awk '{{print $2}}'" + processID = subprocess.check_output(psCmd, shell=True).decode("utf-8").strip() # psCmd = f"pgrep {toBeKilled}" - processID = subprocess.check_output( - psCmd, shell=True) - + while(processID): - killCmd = f"pkill {signal} {processID} > /dev/null " + killCmd = "kill %s %s > /dev/null 2>&1" % (signal, processID) os.system(killCmd) time.sleep(1) - processID = subprocess.check_output( - psCmd, shell=True).decode("utf-8") + processID = subprocess.check_output(psCmd, shell=True).decode("utf-8").strip() if not platform.system().lower() == 'windows': port = 6041 fuserCmd = f"fuser -k -n tcp {port} > /dev/null" diff --git a/tests/system-test/2-query/db.py b/tests/system-test/2-query/db.py index 7fe8b96157..451fc0caf3 100644 --- a/tests/system-test/2-query/db.py +++ b/tests/system-test/2-query/db.py @@ -42,16 +42,35 @@ class TDTestCase: tdSql.query("select count(c1) from dbns.ntb interval(1b)") tdSql.checkRows(2) + + def case2(self): + tdSql.query("show variables") + tdSql.checkRows(4) + + for i in range(self.replicaVar): + tdSql.query("show dnode %d variables like 'debugFlag'" % (i + 1)) + tdSql.checkRows(1) + tdSql.checkData(0, 0, i + 1) + tdSql.checkData(0, 1, 'debugFlag') + tdSql.checkData(0, 2, 0) + + tdSql.query("show dnode 1 variables like '%debugFlag'") + tdSql.checkRows(21) + + tdSql.query("show dnode 1 variables like '____debugFlag'") + tdSql.checkRows(2) def run(self): # sourcery skip: extract-duplicate-method, remove-redundant-fstring - tdSql.prepare() + tdSql.prepare(replica = self.replicaVar) tdLog.printNoPrefix("==========start case1 run ...............") - self.case1() - tdLog.printNoPrefix("==========end case1 run ...............") + tdLog.printNoPrefix("==========start case2 run ...............") + self.case2() + tdLog.printNoPrefix("==========end case2 run ...............") + def stop(self): tdSql.close() tdLog.success(f"{__file__} successfully executed")