diff --git a/tests/pytest/util/dnodes.py b/tests/pytest/util/dnodes.py index 254d5f166b408e4abe488bf41b33143a7b702b26..235e4d25e020296a7c8b02cb6db96aaca0aec548 100644 --- a/tests/pytest/util/dnodes.py +++ b/tests/pytest/util/dnodes.py @@ -251,7 +251,7 @@ class TDDnode: "dnode:%d is deployed and configured by %s" % (self.index, self.cfgPath)) - def getBuildPath(self): + def getBuildPath(self, tool="taosd"): buildPath = "" selfPath = os.path.dirname(os.path.realpath(__file__)) @@ -261,7 +261,7 @@ class TDDnode: projPath = selfPath[:selfPath.find("tests")] for root, dirs, files in os.walk(projPath): - if (("taosd") in files): + if ((tool) in files): rootRealPath = os.path.dirname(os.path.realpath(root)) if ("packaging" not in rootRealPath): buildPath = root[:len(root)-len("/build/bin")] diff --git a/tests/system-test/5-taos-tools/taosdump/basic.py b/tests/system-test/5-taos-tools/taosdump/basic.py new file mode 100644 index 0000000000000000000000000000000000000000..a05cf39001e600085b654d20e0180351cc94f195 --- /dev/null +++ b/tests/system-test/5-taos-tools/taosdump/basic.py @@ -0,0 +1,61 @@ +################################################################### +# Copyright (c) 2016 by TAOS Technologies, Inc. +# All rights reserved. +# +# This file is proprietary and confidential to TAOS Technologies. +# No part of this file may be reproduced, stored, transmitted, +# disclosed or used in any form or by any means other than as +# expressly provided by the written permission from Jianhui Tao +# +################################################################### + +# -*- coding: utf-8 -*- + +import sys +import os +from util.log import * +from util.cases import * +from util.sql import * +from util.dnodes import * +import subprocess + + +class TDTestCase: + def caseDescription(self): + ''' + case1: [TD-11977] start taosdump without taosd + case1: [TD-11977] start taosBenchmark without taosd + case1: [TD-11977] start taosAdaptor without taosd + ''' + return + + def init(self, conn, logSql): + tdLog.debug("start to execute %s" % __file__) + tdSql.init(conn.cursor(), logSql) + + def run(self): + tdSql.prepare() + + tools = ["taosdump", "taosBenchmark", "taosAdaptor"] + tdDnodes.stop(1) + + for tool in tools: + path = tdDnodes.dnodes[1].getBuildPath(tool) + + try: + path += "/build/bin/" + print(f"{path}{tool}") + if tool == "taosBenchmark": + os.system(f"{path}{tool} -y") + else: + os.system(f"{path}{tool}") + except: + pass + + def stop(self): + tdSql.close() + tdLog.success("%s successfully executed" % __file__) + + +tdCases.addWindows(__file__, TDTestCase()) +tdCases.addLinux(__file__, TDTestCase()) diff --git a/tests/system-test/fulltest.sh b/tests/system-test/fulltest.sh index f9644fa1c867b028cdf038067322374aaf7832fc..222241d65ce8c8feaf4dd68113eba41eaa069602 100755 --- a/tests/system-test/fulltest.sh +++ b/tests/system-test/fulltest.sh @@ -3,3 +3,4 @@ python3 test.py -f 4-taosAdapter/taosAdapter_query.py python3 test.py -f 4-taosAdapter/taosAdapter_insert.py #python3 test.py -f 2-query/9-others/TD-11389.py # this case will run when this bug fix TD-11389 +python3 test.py -f 5-taos-tools/taosdump/basic.py \ No newline at end of file