mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scripts/device-crash-test: hide tracebacks for QMP connect errors

Browse Source 
Generally, the traceback for a connection failure is uninteresting and
all we need to know is that the connection attempt failed.

Reduce the verbosity in these cases, except when debugging.

Signed-off-by: John Snow <jsnow@redhat.com>
Reported-by: Thomas Huth <thuth@redhat.com>
Tested-by: Thomas Huth <thuth@redhat.com>
Message-id: 20211111143719.2162525-6-jsnow@redhat.com
Signed-off-by: John Snow <jsnow@redhat.com>
This commit is contained in:
John Snow 2021-11-11 09:37:19 -05:00
parent 76f86e78b2
commit c398a241ec
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
scripts/device-crash-test
View File

@ -36,6 +36,7 @@ from itertools import chain
sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'python'))
from qemu.machine import QEMUMachine
from qemu.aqmp import ConnectError
logger = logging.getLogger('device-crash-test')
dbg = logger.debug
@ -355,10 +356,12 @@ def checkOneCase(args, testcase):
dbg("will launch QEMU: %s", cmdline)
vm = QEMUMachine(binary=binary, args=args)
exc = None
exc_traceback = None
try:
vm.launch()
except Exception:
except Exception as this_exc:
exc = this_exc
exc_traceback = traceback.format_exc()
dbg("Exception while running test case")
finally:
@ -366,8 +369,9 @@ def checkOneCase(args, testcase):
ec = vm.exitcode()
log = vm.get_log()
if exc_traceback is not None or ec != 0:
return {'exc_traceback':exc_traceback,
if exc is not None or ec != 0:
return {'exc': exc,
'exc_traceback':exc_traceback,
'exitcode':ec,
'log':log,
'testcase':testcase,
@ -455,6 +459,17 @@ def logFailure(f, level):
for l in f['log'].strip().split('\n'):
logger.log(level, "log: %s", l)
logger.log(level, "exit code: %r", f['exitcode'])
# If the Exception is merely a QMP connect error,
# reduce the logging level for its traceback to
# improve visual clarity.
if isinstance(f.get('exc'), ConnectError):
logger.log(level, "%s.%s: %s",
type(f['exc']).__module__,
type(f['exc']).__qualname__,
str(f['exc']))
level = logging.DEBUG
if f['exc_traceback']:
logger.log(level, "exception:")
for l in f['exc_traceback'].split('\n'):