This adds a helper function that logs both the QMP request and the
received response before returning it.
Signed-off-by: Kevin Wolf
Reviewed-by: Jeff Cody
---
tests/qemu-iotests/iotests.py | 11 +++
1 file changed, 11 insertions(+)
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index 17aa7c88dc..2f54823db6 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -206,6 +206,10 @@ def filter_qmp_event(event):
event['timestamp']['microseconds'] = 'USECS'
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=[]):
for flt in filters:
msg = flt(msg)
@@ -389,6 +393,13 @@ class VM(qtest.QEMUQtestMachine):
result.append(filter_qmp_event(ev))
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'([^\[]+)\[([^\]]+)\]')
--
2.13.6
