X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Futil.py;h=1ab5c1f2350213d25579a145e3f32536f9ac0e9a;hb=40dd73bcfa7625773e1e0cc049134f9d7107bccc;hp=d8ecf270f676f098a86b12c6c122f37ac61987da;hpb=825fc4892ee7ec3cff83b2754cd921c0157e62f8;p=vpp.git diff --git a/test/util.py b/test/util.py index d8ecf270f67..1ab5c1f2350 100644 --- a/test/util.py +++ b/test/util.py @@ -2,6 +2,7 @@ import socket import sys +import os.path from abc import abstractmethod, ABCMeta from cStringIO import StringIO from scapy.utils6 import in6_mactoifaceid @@ -73,19 +74,32 @@ def ip6_normalize(ip6): socket.inet_pton(socket.AF_INET6, ip6)) -def check_core_path(logger, core_path): +def get_core_path(tempdir): + return "%s/%s" % (tempdir, get_core_pattern()) + + +def is_core_present(tempdir): + return os.path.isfile(get_core_path(tempdir)) + + +def get_core_pattern(): with open("/proc/sys/kernel/core_pattern", "r") as f: - corefmt = f.read() - if corefmt.startswith("|"): - logger.error( - "WARNING: redirecting the core dump through a" - " filter may result in truncated dumps.") - logger.error( - " You may want to check the filter settings" - " or uninstall it and edit the" - " /proc/sys/kernel/core_pattern accordingly.") - logger.error( - " current core pattern is: %s" % corefmt) + corefmt = f.read().strip() + return corefmt + + +def check_core_path(logger, core_path): + corefmt = get_core_pattern() + if corefmt.startswith("|"): + logger.error( + "WARNING: redirecting the core dump through a" + " filter may result in truncated dumps.") + logger.error( + " You may want to check the filter settings" + " or uninstall it and edit the" + " /proc/sys/kernel/core_pattern accordingly.") + logger.error( + " current core pattern is: %s" % corefmt) class NumericConstant(object):