From bdcd4732cc1734f16aad06375c5644e6c5e92e4b Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Sat, 13 Jan 2024 17:21:48 +0800
Subject: [PATCH] fix: fullopt.py test ok

---
 tests/army/community/cmdline/fullopt.py |  6 ++++--
 tests/army/frame/etool.py               | 16 ++++++++++++----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/tests/army/community/cmdline/fullopt.py b/tests/army/community/cmdline/fullopt.py
index 70be4eb920..22667149ae 100644
--- a/tests/army/community/cmdline/fullopt.py
+++ b/tests/army/community/cmdline/fullopt.py
@@ -45,7 +45,7 @@ class TDTestCase(TBase):
         self.checkListNotEmpty(rets)
         # b r w s 
         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)
         # -C
         rets = etool.runBinFile("taos", "-C")
@@ -64,14 +64,16 @@ class TDTestCase(TBase):
         lname = "testhostnamelength"
         lname.rjust(130, 'a')
 
-        # invalid
+        # except test
         sql = f"show vgroups;"
         etool.exeBinFile("taos", f'-h {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'-a {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 server', wait=False)
 
diff --git a/tests/army/frame/etool.py b/tests/army/frame/etool.py
index c06afcd76e..0650d4a0e2 100644
--- a/tests/army/frame/etool.py
+++ b/tests/army/frame/etool.py
@@ -47,20 +47,28 @@ def curFile(fullPath, filename):
 
 
 # run build/bin file
-def runBinFile(fname, command):
+def runBinFile(fname, command, show=True):
     binFile = frame.epath.binFile(fname)
     if frame.eos.isWin():
         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
-def exeBinFile(fname, command, wait=True):
+def exeBinFile(fname, command, wait=True, show=True):
     binFile = frame.epath.binFile(fname)
     if frame.eos.isWin():
         binFile += ".exe"
 
+    cmd = f"{binFile} {command}"
     if wait:
+        if show:
+            tdLog.info("wait exe:" + cmd)
         return frame.eos.exe(f"{binFile} {command}")
     else:
-        return frame.eos.exeNoWait(f"{binFile} {command}")
\ No newline at end of file
+        if show:
+            tdLog.info("no wait exe:" + cmd)
+        return frame.eos.exeNoWait(cmd)
\ No newline at end of file