mirror of
https://github.com/qemu/qemu.git
synced 2025-08-09 10:25:06 +00:00
qemu-iotests: Add VM.qmp_log()
This adds a helper function that logs both the QMP request and the received response before returning it. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Jeff Cody <jcody@redhat.com> Reviewed-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
parent
5ad1dbf76a
commit
e234398a8e
@ -206,6 +206,10 @@ def filter_qmp_event(event):
|
|||||||
event['timestamp']['microseconds'] = 'USECS'
|
event['timestamp']['microseconds'] = 'USECS'
|
||||||
return event
|
return event
|
||||||
|
|
||||||
|
def filter_testfiles(msg):
|
||||||
|
prefix = os.path.join(test_dir, "%s-" % (os.getpid()))
|
||||||
|
return msg.replace(prefix, 'TEST_DIR/PID-')
|
||||||
|
|
||||||
def log(msg, filters=[]):
|
def log(msg, filters=[]):
|
||||||
for flt in filters:
|
for flt in filters:
|
||||||
msg = flt(msg)
|
msg = flt(msg)
|
||||||
@ -389,6 +393,13 @@ def get_qmp_events_filtered(self, wait=True):
|
|||||||
result.append(filter_qmp_event(ev))
|
result.append(filter_qmp_event(ev))
|
||||||
return result
|
return result
|
||||||
|
|
||||||
|
def qmp_log(self, cmd, filters=[filter_testfiles], **kwargs):
|
||||||
|
logmsg = "{'execute': '%s', 'arguments': %s}" % (cmd, kwargs)
|
||||||
|
log(logmsg, filters)
|
||||||
|
result = self.qmp(cmd, **kwargs)
|
||||||
|
log(str(result), filters)
|
||||||
|
return result
|
||||||
|
|
||||||
|
|
||||||
index_re = re.compile(r'([^\[]+)\[([^\]]+)\]')
|
index_re = re.compile(r'([^\[]+)\[([^\]]+)\]')
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user