proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-04 20:18:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7657 from mjstapp/fix_topo_asan_noise

Browse Source 
tests: Cleanup topo asan noise
This commit is contained in:
Donald Sharp 2020-12-02 20:07:53 -05:00 committed by GitHub
commit dd2a6ddb3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tests/topotests/lib/topotest.py
View File

@ -919,10 +919,10 @@ def checkAddressSanitizerError(output, router, component, logdir=""):
)
# Sanitizer Error found in log
pidMark = asanErrorRe.group(1)
addressSantizerLog = re.search(
addressSanitizerLog = re.search(
"%s(.*)%s" % (pidMark, pidMark), output, re.DOTALL
)
if addressSantizerLog:
if addressSanitizerLog:
# Find Calling Test. Could be multiple steps back
testframe=sys._current_frames().values()[0]
level=0
@ -964,7 +964,7 @@ def checkAddressSanitizerError(output, router, component, logdir=""):
% (callingTest, callingProc, router)
)
sys.stderr.write(
"\n".join(addressSantizerLog.group(1).splitlines()) + "\n"
"\n".join(addressSanitizerLog.group(1).splitlines()) + "\n"
)
addrSanFile.write("## Error: %s\n\n" % asanErrorRe.group(2))
addrSanFile.write(
@ -973,32 +973,32 @@ def checkAddressSanitizerError(output, router, component, logdir=""):
)
addrSanFile.write(
" "
+ "\n ".join(addressSantizerLog.group(1).splitlines())
+ "\n ".join(addressSanitizerLog.group(1).splitlines())
+ "\n"
)
addrSanFile.write("\n---------------\n")
return
addressSantizerError = re.search(
addressSanitizerError = re.search(
"(==[0-9]+==)ERROR: AddressSanitizer: ([^\s]*) ", output
)
if addressSantizerError:
processAddressSanitizerError(addressSantizerError, output, router, component)
if addressSanitizerError:
processAddressSanitizerError(addressSanitizerError, output, router, component)
return True
# No Address Sanitizer Error in Output. Now check for AddressSanitizer daemon file
if logdir:
filepattern=logdir+"/"+router+"/"+component+".asan.*"
sys.stderr.write("Log check for %s on %s, pattern %s\n" % (component, router, filepattern))
logger.debug("Log check for %s on %s, pattern %s\n" % (component, router, filepattern))
for file in glob.glob(filepattern):
with open(file, "r") as asanErrorFile:
asanError=asanErrorFile.read()
addressSantizerError = re.search(
addressSanitizerError = re.search(
"(==[0-9]+==)ERROR: AddressSanitizer: ([^\s]*) ", asanError
)
if addressSantizerError:
processAddressSanitizerError(addressSantizerError, asanError, router, component)
if addressSanitizerError:
processAddressSanitizerError(addressSanitizerError, asanError, router, component)
return True
return False