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

[TD-2734]<test>fix timeout error

This commit is contained in:
liuyq-617 2021-01-12 16:56:01 +08:00
parent 037816547b
commit 0616475e50
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/pytest/util/dnodes.py
View File

@ -212,7 +212,7 @@ class TDDnode:
self.cfgDict["logDir"] = self.logDir self.cfgDict["logDir"] = self.logDir
# self.cfg("dataDir",self.dataDir) # self.cfg("dataDir",self.dataDir)
# self.cfg("logDir",self.logDir) # self.cfg("logDir",self.logDir)
print(updatecfgDict) # print(updatecfgDict)
isFirstDir = 1 isFirstDir = 1
if updatecfgDict[0] and updatecfgDict[0][0]: if updatecfgDict[0] and updatecfgDict[0][0]:
print(updatecfgDict[0][0]) print(updatecfgDict[0][0])
@ -292,13 +292,15 @@ class TDDnode:
break break
popen = subprocess.Popen('tail -f ' + logFile, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True) popen = subprocess.Popen('tail -f ' + logFile, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
pid = popen.pid pid = popen.pid
print('Popen.pid:' + str(pid)) # print('Popen.pid:' + str(pid))
timeout = time.time() + 60*2
while True: while True:
line = popen.stdout.readline().strip() line = popen.stdout.readline().strip()
if bkey in line: if bkey in line:
print(line)
popen.kill() popen.kill()
break break
if time.time() > timeout:
tdLog.exit('wait too long for taosd start')
tdLog.debug("the dnode:%d has been started." % (self.index)) tdLog.debug("the dnode:%d has been started." % (self.index))
else: else:
tdLog.debug("wait 10 seconds for the dnode:%d to start." % (self.index)) tdLog.debug("wait 10 seconds for the dnode:%d to start." % (self.index))