提交 4191754f 编写于 作者: sangshuduo's avatar sangshuduo

fix test.py to support steven's case

上级 5e425abf
......@@ -34,12 +34,12 @@ python3 ./test.py $1 -f table/db_table.py
python3 ./test.py -s $1
sleep 1
python3 ./test.py $1 -f import_merge/importDataLastTO.py
python3 ./test.py -s $1
sleep 1
python3 ./test.py $1 -f import_merge/importDataLastT.py
python3 ./test.py -s $1
sleep 1
#python3 ./test.py $1 -f import_merge/importDataLastTO.py
#python3 ./test.py -s $1
#sleep 1
#python3 ./test.py $1 -f import_merge/importDataLastT.py
#python3 ./test.py -s $1
#sleep 1
python3 ./test.py $1 -f import_merge/importDataTO.py
python3 ./test.py -s $1
sleep 1
......
......@@ -83,36 +83,35 @@ if __name__ == "__main__":
tdLog.exit('stop All dnodes')
tdDnodes.init(deployPath)
tdDnodes.setTestCluster(testCluster)
tdDnodes.setValgrind(valgrind)
tdDnodes.stopAll()
tdDnodes.deploy(1)
tdDnodes.start(1)
if masterIp == "":
tdDnodes.init(deployPath)
tdDnodes.setTestCluster(testCluster)
tdDnodes.setValgrind(valgrind)
if testCluster:
tdLog.notice("Procedures for testing cluster")
if fileName == "all":
tdCases.runAllCluster()
else:
tdCases.runOneCluster(fileName)
host='127.0.0.1'
else:
host=masterIp
tdLog.notice("Procedures for tdengine deployed in %s" % (host))
if testCluster:
tdLog.notice("Procedures for testing cluster")
if fileName == "all":
tdCases.runAllCluster()
else:
tdLog.notice("Procedures for testing self-deployment")
tdDnodes.stopAll()
tdDnodes.deploy(1)
tdDnodes.start(1)
conn = taos.connect(
host='127.0.0.1',
config=tdDnodes.getSimCfgPath())
if fileName == "all":
tdCases.runAllLinux(conn)
else:
tdCases.runOneLinux(conn, fileName)
conn.close()
tdCases.runOneCluster(fileName)
else:
tdLog.notice("Procedures for tdengine deployed in %s" % (masterIp))
cfgPath = "../../build/test/cfg" # was: tdDnodes.getSimCfgPath()
conn = taos.connect(host=masterIp, config=cfgPath)
tdLog.notice("Procedures for testing self-deployment")
conn = taos.connect(
host,
config=tdDnodes.getSimCfgPath())
if fileName == "all":
tdCases.runAllWindows(conn)
tdCases.runAllLinux(conn)
else:
tdCases.runOneWindows(conn, fileName)
conn.close()
tdCases.runOneLinux(conn, fileName)
conn.close()
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册