proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-17 21:38:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

topotest: adjust luCommand to accept wait_time

Browse Source 
Allow users of `luCommand` to specify wait time between commands
execution and simplify the `wait` method implementation.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
This commit is contained in:
Rafael Zalamena 2019-07-18 11:29:33 -03:00
parent 2a76b0a8e2
commit 0f94985fdd
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tests/topotests/lib/lutil.py
View File

@ -243,22 +243,25 @@ Total %-4d %-4d %d\n\
return js return js
return ret return ret
def wait(self, target, command, regexp, op, result, wait, returnJson): def wait(self, target, command, regexp, op, result, wait, returnJson, wait_time=0.5):
self.log('%s:%s WAIT:%s:%s:%s:%s:%s:%s:' % \ self.log('%s:%s WAIT:%s:%s:%s:%s:%s:%s:%s:' % \
(self.l_filename, self.l_line, target, command, regexp, op, result,wait)) (self.l_filename, self.l_line, target, command, regexp, op, result,wait,wait_time))
found = False found = False
n = 0 n = 0
startt = time.time() startt = time.time()
# Calculate the amount of `sleep`s we are going to peform. # Calculate the amount of `sleep`s we are going to peform.
wait_count = int(math.ceil(wait / 0.5)) wait_count = int(math.ceil(wait / wait_time)) + 1
while wait_count > 0 and found is False: while wait_count > 0:
found = self.command(target, command, regexp, op, result, returnJson)
wait_count -= 1
n += 1 n += 1
if wait_count > 0 and found is False: found = self.command(target, command, regexp, op, result, returnJson)
time.sleep (0.5) if found is not False:
break
wait_count -= 1
if wait_count > 0:
time.sleep(wait_time)
delta = time.time() - startt delta = time.time() - startt
self.log('Done after %d loops, time=%s, Found=%s' % (n, delta, found)) self.log('Done after %d loops, time=%s, Found=%s' % (n, delta, found))
@ -286,11 +289,11 @@ def luStart(baseScriptDir='.', baseLogDir='.', net='',
LUtil.l_dotall_experiment = False LUtil.l_dotall_experiment = False
LUtil.l_dotall_experiment = True LUtil.l_dotall_experiment = True
def luCommand(target, command, regexp='.', op='none', result='', time=10, returnJson=False): def luCommand(target, command, regexp='.', op='none', result='', time=10, returnJson=False, wait_time=0.5):
if op != 'wait': if op != 'wait':
return LUtil.command(target, command, regexp, op, result, returnJson) return LUtil.command(target, command, regexp, op, result, returnJson)
else: else:
return LUtil.wait(target, command, regexp, op, result, time, returnJson) return LUtil.wait(target, command, regexp, op, result, time, returnJson, wait_time)
def luLast(usenl=False): def luLast(usenl=False):
if usenl: if usenl: