[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 06/14] qemu-iotests: Add VM.qmp_log()
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PATCH 06/14] qemu-iotests: Add VM.qmp_log() |
Date: |
Fri, 25 May 2018 18:33:19 +0200 |
This adds a helper function that logs both the QMP request and the
received response before returning it.
Signed-off-by: Kevin Wolf <address@hidden>
---
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..319d898172 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/')
+
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, **kwargs):
+ logmsg = "{'execute': '%s', 'arguments': %s}" % (cmd, kwargs)
+ log(filter_testfiles(logmsg))
+ result = self.qmp(cmd, **kwargs)
+ log(result)
+ return result
+
index_re = re.compile(r'([^\[]+)\[([^\]]+)\]')
--
2.13.6
- Re: [Qemu-block] [PATCH 02/14] vhdx: Fix vhdx_co_create() return value, (continued)
Re: [Qemu-block] [PATCH 06/14] qemu-iotests: Add VM.qmp_log(), Jeff Cody, 2018/05/29
[Qemu-block] [PATCH 07/14] qemu-iotests: Add iotests.img_info_log(), Kevin Wolf, 2018/05/25
[Qemu-block] [PATCH 09/14] qemu-iotests: Rewrite 207 for blockdev-create job, Kevin Wolf, 2018/05/25