From 0b7ae35126125de28179c6c309203a73f5bb74bf Mon Sep 17 00:00:00 2001 From: Alex Duan <417921451@qq.com> Date: Wed, 5 Feb 2025 15:59:59 +0800 Subject: [PATCH] fix: forgot to submit army/frame/etool.py --- tests/army/frame/caseBase.py | 1 + tests/army/frame/etool.py | 25 ++++++++++++++++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/tests/army/frame/caseBase.py b/tests/army/frame/caseBase.py index 3cb33e8fbc..d8dcb29e44 100644 --- a/tests/army/frame/caseBase.py +++ b/tests/army/frame/caseBase.py @@ -37,6 +37,7 @@ class TBase: # save param self.replicaVar = int(replicaVar) tdSql.init(conn.cursor(), True) + self.tmpdir = "tmp" # record server information self.dnodeNum = 0 diff --git a/tests/army/frame/etool.py b/tests/army/frame/etool.py index 0650d4a0e2..9065a3dede 100644 --- a/tests/army/frame/etool.py +++ b/tests/army/frame/etool.py @@ -23,12 +23,31 @@ import frame.epath import frame.eos from frame.log import * -# run taosBenchmark with command or json file mode -def benchMark(command = "", json = "") : - # get taosBenchmark path +# taosdump +def taosDumpFile(): + bmFile = frame.epath.binFile("taosdump") + if frame.eos.isWin(): + bmFile += ".exe" + return bmFile + +# taosBenchmark +def benchMarkFile(): bmFile = frame.epath.binFile("taosBenchmark") if frame.eos.isWin(): bmFile += ".exe" + return bmFile + +# taosAdapter +def taosAdapterFile(): + bmFile = frame.epath.binFile("taosAdapter") + if frame.eos.isWin(): + bmFile += ".exe" + return bmFile + +# run taosBenchmark with command or json file mode +def benchMark(command = "", json = "") : + # get taosBenchmark path + bmFile = benchMarkFile() # run if command != "":