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

Merge pull request #14328 from taosdata/fix/ZhiqiangWang/TD-16357-lengthen-taos-shell-wait-time 

test: lengthen taos shell wait time
This commit is contained in:
Zhiqiang Wang 2022-06-28 18:19:22 +08:00 committed by GitHub
parent e27381a5a8 232e96abab
commit c2f1c3c95f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/system-test/0-others/taosShell.py
View File

@ -44,13 +44,13 @@ def taos_command (buildPath, key, value, expectString, cfgDir, sqlString='', key
tdLog.info ("taos cmd: %s" % taosCmd) tdLog.info ("taos cmd: %s" % taosCmd)
child = taosExpect.spawn(taosCmd, timeout=10) child = taosExpect.spawn(taosCmd, timeout=20)
#output = child.readline() #output = child.readline()
#print (output.decode()) #print (output.decode())
if len(expectString) != 0: if len(expectString) != 0:
i = child.expect([expectString, taosExpect.TIMEOUT, taosExpect.EOF], timeout=10) i = child.expect([expectString, taosExpect.TIMEOUT, taosExpect.EOF], timeout=20)
else: else:
i = child.expect([taosExpect.TIMEOUT, taosExpect.EOF], timeout=10) i = child.expect([taosExpect.TIMEOUT, taosExpect.EOF], timeout=20)
if platform.system().lower() == 'windows': if platform.system().lower() == 'windows':
retResult = child.before retResult = child.before
@ -62,7 +62,7 @@ def taos_command (buildPath, key, value, expectString, cfgDir, sqlString='', key
print ('taos login success! Here can run sql, taos> ') print ('taos login success! Here can run sql, taos> ')
if len(sqlString) != 0: if len(sqlString) != 0:
child.sendline (sqlString) child.sendline (sqlString)
w = child.expect(["Query OK", taosExpect.TIMEOUT, taosExpect.EOF], timeout=1) w = child.expect(["Query OK", taosExpect.TIMEOUT, taosExpect.EOF], timeout=10)
if w == 0: if w == 0:
return "TAOS_OK" return "TAOS_OK"
else: else: