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

test: adjust test case for taos/taosd version output

This commit is contained in:
kailixu 2024-06-06 13:01:03 +08:00
parent 4beaf871b7
commit 5eb4f66452
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/system-test/0-others/show.py
View File

@ -191,12 +191,12 @@ class TDTestCase:
tdSql.query('show local variables') tdSql.query('show local variables')
for i in tdSql.queryResult: for i in tdSql.queryResult:
if i[0].lower() == "gitinfo": if i[0].lower() == "gitinfo":
taos_gitinfo_sql = f"gitinfo: {i[1]}" taos_gitinfo_sql = f"git: {i[1]}"
taos_info = os.popen('taos -V').read() taos_info = os.popen('taos -V').read()
taos_gitinfo = re.findall("^gitinfo.*",taos_info,re.M) taos_gitinfo = re.findall("^git: .*",taos_info,re.M)
tdSql.checkEqual(taos_gitinfo_sql,taos_gitinfo[0]) tdSql.checkEqual(taos_gitinfo_sql,taos_gitinfo[0])
taosd_info = os.popen('taosd -V').read() taosd_info = os.popen('taosd -V').read()
taosd_gitinfo = re.findall("^gitinfo.*",taosd_info,re.M) taosd_gitinfo = re.findall("^git: .*",taosd_info,re.M)
tdSql.checkEqual(taosd_gitinfo_sql,taosd_gitinfo[0]) tdSql.checkEqual(taosd_gitinfo_sql,taosd_gitinfo[0])
def show_base(self): def show_base(self):

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

@ -5,6 +5,7 @@ import time
import socket import socket
import os import os
import platform import platform
import re
if platform.system().lower() == 'windows': if platform.system().lower() == 'windows':
import wexpect as taosExpect import wexpect as taosExpect
else: else:
@ -370,10 +371,11 @@ class TDTestCase:
if retCode != "TAOS_OK": if retCode != "TAOS_OK":
tdLog.exit("taos -V fail") tdLog.exit("taos -V fail")
version = 'version: ' + version version = 'taos version: ' + version
retVal = retVal.replace("\n", "") # retVal = retVal.replace("\n", "")
retVal = retVal.replace("\r", "") # retVal = retVal.replace("\r", "")
if retVal.startswith(version) == False: taosVersion = re.findall((f'^%s'%(version)), retVal,re.M)
if len(taosVersion) == 0:
print ("return version: [%s]"%retVal) print ("return version: [%s]"%retVal)
print ("dict version: [%s]"%version) print ("dict version: [%s]"%version)
tdLog.exit("taos -V version not match") tdLog.exit("taos -V version not match")