proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2026-01-03 20:43:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib: lutil cleanup move utilities/lutil.py -> lib/lutil.py add: luShowFail, CallOnFail, luStart parameter to set log dir change default wait to 10sec

Browse Source 
Signed-off-by: Lou Berger <lberger@labn.net>
This commit is contained in:
Lou Berger 2017-12-05 21:11:28 -05:00 committed by Donald Sharp
parent 7ed102b925
commit a582a8e9c5
1 changed files with 43 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
tests/topotests/utilities/lutil.py → tests/topotests/lib/lutil.py
View File

@ -31,10 +31,12 @@ from mininet.net import Mininet
class lUtil:
#to be made configurable in the future
base_script_dir = '.'
base_log_dir = '.'
fout_name = 'output.log'
fsum_name = 'summary.txt'
l_level = 9
base_dir = '.'
CallOnFail = False
l_total = 0
l_pass = 0
@ -63,8 +65,8 @@ class lUtil:
f = 1
p = 0
self.l_fail += 1
res = "%-4d %-6s %-56s %-4d %-4d" % (self.l_total, target, str, p, f)
self.log (res)
res = "%-4d %-6s %-56s %-4d %d" % (self.l_total, target, str, p, f)
self.log ('R:'+res)
if self.fsum == '':
self.fsum = open(self.fsum_name, 'w', 0)
self.fsum.write('\
@ -74,11 +76,13 @@ Test Target Summary Pass Fail\n
self.fsum.write('\
******************************************************************************\n')
self.fsum.write(res+'\n')
if f == 1 and self.CallOnFail != False:
self.CallOnFail()
def closeFiles(self):
ret = '\
******************************************************************************\n\
Total %-4d %-4d %-4d\n\
Total %-4d %-4d %d\n\
******************************************************************************'\
% (self.l_total, self.l_pass, self.l_fail)
if self.fsum != '':
@ -99,6 +103,12 @@ Total %-4d %-4d %-4d\n
self.l_filename = name
self.line = 0
def getCallOnFail(self):
return self.CallOnFail
def setCallOnFail(self, CallOnFail):
self.CallOnFail = CallOnFail
def strToArray(self, string):
a = []
c = 0
@ -210,30 +220,37 @@ Total %-4d %-4d %-4d\n
LUtil=lUtil()
#entry calls
def luStart(baseDir='.', net='', fout='output.log', fsum='summary.txt', level=9):
LUtil.base_dir = baseDir
def luStart(baseScriptDir='.', baseLogDir='.', net='',
fout='output.log', fsum='summary.txt', level=9):
LUtil.base_script_dir = baseScriptDir
LUtil.base_log_dir = baseLogDir
LUtil.net = net
if fout != '':
LUtil.fout_name = fout
if fsum != '':
LUtil.fsum_name = fsum
LUtil.fout_name = baseLogDir + '/' + fout
if fsum != None:
LUtil.fsum_name = baseLogDir + '/' + fsum
LUtil.l_level = level
def luCommand(target, command, regexp='.', op='none', result='', time=60):
def luCommand(target, command, regexp='.', op='none', result='', time=10):
if op != 'wait':
return LUtil.command(target, command, regexp, op, result)
else:
return LUtil.wait(target, command, regexp, op, result, time)
def luInclude(filename):
def luInclude(filename, CallOnFail=None):
global LUtil
tstFile = LUtil.base_dir + '/' + filename
tstFile = LUtil.base_script_dir + '/' + filename
LUtil.setFilename(filename)
if CallOnFail != None:
oldCallOnFail = LUtil.getCallOnFail()
LUtil.setCallOnFail(CallOnFail)
if filename.endswith('.py'):
execfile(tstFile)
else:
LUtil.execTestFile(tstFile)
if CallOnFail != None:
LUtil.setCallOnFail(oldCallOnFail)
def luFinish():
return LUtil.closeFiles()
@ -244,9 +261,22 @@ def luNumFail():
def luNumPass():
return LUtil.l_pass
def luShowFail():
printed = 0
print("Showing error summary from See %s" % LUtil.fsum_name)
sf = open(LUtil.fsum_name, 'r')
for line in sf:
if line[-2] != "0":
printed+=1
sys.stdout.write(line)
sys.stdout.flush()
sf.close()
if printed > 0:
print("See %s for details of errors" % LUtil.fout_name)
#for testing
if __name__ == '__main__':
print(os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + '/utilities')
print(os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + '/lib')
luStart()
for arg in sys.argv[1:]:
luInclude(arg)