xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: fullopt.py test ok

This commit is contained in:
Alex Duan 2024-01-13 17:21:48 +08:00
parent cc909d7d30
commit bdcd4732cc
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/army/community/cmdline/fullopt.py
View File

@ -45,7 +45,7 @@ class TDTestCase(TBase):
self.checkListNotEmpty(rets) self.checkListNotEmpty(rets)
# b r w s # b r w s
sql = f"select * from {self.db}.{self.stb} limit 10" sql = f"select * from {self.db}.{self.stb} limit 10"
rets = etool.runBinFile("taos", f'-B -r -w -s "{sql}" ') rets = etool.runBinFile("taos", f'-B -r -w 100 -s "{sql}" ')
self.checkListNotEmpty(rets) self.checkListNotEmpty(rets)
# -C # -C
rets = etool.runBinFile("taos", "-C") rets = etool.runBinFile("taos", "-C")
@ -64,14 +64,16 @@ class TDTestCase(TBase):
lname = "testhostnamelength" lname = "testhostnamelength"
lname.rjust(130, 'a') lname.rjust(130, 'a')
# invalid # except test
sql = f"show vgroups;" sql = f"show vgroups;"
etool.exeBinFile("taos", f'-h {lname} -s "{sql}" ', wait=False) etool.exeBinFile("taos", f'-h {lname} -s "{sql}" ', wait=False)
etool.exeBinFile("taos", f'-u {lname} -s "{sql}" ', wait=False) etool.exeBinFile("taos", f'-u {lname} -s "{sql}" ', wait=False)
etool.exeBinFile("taos", f'-d {lname} -s "{sql}" ', wait=False) etool.exeBinFile("taos", f'-d {lname} -s "{sql}" ', wait=False)
etool.exeBinFile("taos", f'-a {lname} -s "{sql}" ', wait=False) etool.exeBinFile("taos", f'-a {lname} -s "{sql}" ', wait=False)
etool.exeBinFile("taos", f'-p{lname} -s "{sql}" ', wait=False) etool.exeBinFile("taos", f'-p{lname} -s "{sql}" ', wait=False)
etool.exeBinFile("taos", f'-w -s "{sql}" ', wait=False)
# others
etool.exeBinFile("taos", f'-N 200 -l 2048 -s "{sql}" ', wait=False) etool.exeBinFile("taos", f'-N 200 -l 2048 -s "{sql}" ', wait=False)
etool.exeBinFile("taos", f'-n server', wait=False) etool.exeBinFile("taos", f'-n server', wait=False)

16
tests/army/frame/etool.py
View File

@ -47,20 +47,28 @@ def curFile(fullPath, filename):
# run build/bin file # run build/bin file
def runBinFile(fname, command): def runBinFile(fname, command, show=True):
binFile = frame.epath.binFile(fname) binFile = frame.epath.binFile(fname)
if frame.eos.isWin(): if frame.eos.isWin():
binFile += ".exe" binFile += ".exe"
return frame.eos.runRetList(f"{binFile} {command}") cmd = f"{binFile} {command}"
if show:
tdLog.info(cmd)
return frame.eos.runRetList(cmd)
# exe build/bin file # exe build/bin file
def exeBinFile(fname, command, wait=True): def exeBinFile(fname, command, wait=True, show=True):
binFile = frame.epath.binFile(fname) binFile = frame.epath.binFile(fname)
if frame.eos.isWin(): if frame.eos.isWin():
binFile += ".exe" binFile += ".exe"
cmd = f"{binFile} {command}"
if wait: if wait:
if show:
tdLog.info("wait exe:" + cmd)
return frame.eos.exe(f"{binFile} {command}") return frame.eos.exe(f"{binFile} {command}")
else: else:
return frame.eos.exeNoWait(f"{binFile} {command}") if show:
tdLog.info("no wait exe:" + cmd)
return frame.eos.exeNoWait(cmd)