[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 07/17] qemu-iotests: Add VM.qmp_log()
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PULL 07/17] qemu-iotests: Add VM.qmp_log() |
Date: |
Wed, 30 May 2018 17:56:37 +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>
Reviewed-by: Jeff Cody <address@hidden>
Reviewed-by: Max Reitz <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..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
- [Qemu-block] [PULL 00/17] Block layer patches, Kevin Wolf, 2018/05/30
- [Qemu-block] [PULL 01/17] qcow2: Fix Coverity warning when calculating the refcount cache size, Kevin Wolf, 2018/05/30
- [Qemu-block] [PULL 02/17] vdi: Fix vdi_co_do_create() return value, Kevin Wolf, 2018/05/30
- [Qemu-block] [PULL 03/17] vhdx: Fix vhdx_co_create() return value, Kevin Wolf, 2018/05/30
- [Qemu-block] [PULL 06/17] qemu-iotests: Add VM.get_qmp_events_filtered(), Kevin Wolf, 2018/05/30
- [Qemu-block] [PULL 05/17] block/create: Make x-blockdev-create a job, Kevin Wolf, 2018/05/30
- [Qemu-block] [PULL 04/17] job: Add error message for failing jobs, Kevin Wolf, 2018/05/30
- [Qemu-block] [PULL 07/17] qemu-iotests: Add VM.qmp_log(),
Kevin Wolf <=
- [Qemu-block] [PULL 08/17] qemu-iotests: Add iotests.img_info_log(), Kevin Wolf, 2018/05/30
- [Qemu-block] [PULL 09/17] qemu-iotests: Add VM.run_job(), Kevin Wolf, 2018/05/30
- [Qemu-block] [PULL 10/17] qemu-iotests: iotests.py helper for non-file protocols, Kevin Wolf, 2018/05/30
- [Qemu-block] [PULL 12/17] qemu-iotests: Rewrite 207 for blockdev-create job, Kevin Wolf, 2018/05/30
- [Qemu-block] [PULL 15/17] qemu-iotests: Rewrite 212 for blockdev-create job, Kevin Wolf, 2018/05/30
- [Qemu-block] [PULL 13/17] qemu-iotests: Rewrite 210 for blockdev-create job, Kevin Wolf, 2018/05/30
- [Qemu-block] [PULL 16/17] qemu-iotests: Rewrite 213 for blockdev-create job, Kevin Wolf, 2018/05/30
- [Qemu-block] [PULL 11/17] qemu-iotests: Rewrite 206 for blockdev-create job, Kevin Wolf, 2018/05/30
- [Qemu-block] [PULL 14/17] qemu-iotests: Rewrite 211 for blockdev-create job, Kevin Wolf, 2018/05/30
- [Qemu-block] [PULL 17/17] block/create: Mark blockdev-create stable, Kevin Wolf, 2018/05/30