[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 3/5] iotests: change qmp_log filters to expect QM
From: |
John Snow |
Subject: |
[Qemu-devel] [PATCH v4 3/5] iotests: change qmp_log filters to expect QMP objects only |
Date: |
Tue, 18 Dec 2018 20:52:28 -0500 |
log() treats filters as if they can always filter its primary argument.
qmp_log treats filters as if they're always text.
Change qmp_log to treat filters as if they're always qmp object filters,
then change the logging call to rely on log()'s ability to serialize QMP
objects, so we're not duplicating that effort.
Because kwargs have been sorted already, the order is preserved.
Edit the only caller who uses filters on qmp_log to use a qmp version,
also added in this patch.
---
tests/qemu-iotests/206 | 4 ++--
tests/qemu-iotests/iotests.py | 24 +++++++++++++++++++++---
2 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/tests/qemu-iotests/206 b/tests/qemu-iotests/206
index e92550fa59..5bb738bf23 100755
--- a/tests/qemu-iotests/206
+++ b/tests/qemu-iotests/206
@@ -27,7 +27,7 @@ iotests.verify_image_format(supported_fmts=['qcow2'])
def blockdev_create(vm, options):
result = vm.qmp_log('blockdev-create',
- filters=[iotests.filter_testfiles],
+ filters=[iotests.filter_qmp_testfiles],
job_id='job0', options=options)
if 'return' in result:
@@ -55,7 +55,7 @@ with iotests.FilePath('t.qcow2') as disk_path, \
'size': 0 })
vm.qmp_log('blockdev-add',
- filters=[iotests.filter_testfiles],
+ filters=[iotests.filter_qmp_testfiles],
driver='file', filename=disk_path,
node_name='imgfile')
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index 55fb60e039..812302538d 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -246,10 +246,29 @@ def filter_qmp_event(event):
event['timestamp']['microseconds'] = 'USECS'
return event
+def filter_qmp(qmsg, filter_fn):
+ '''Given a string filter, filter a QMP object's values.
+ filter_fn takes a (key, value) pair.'''
+ for key in qmsg:
+ if isinstance(qmsg[key], list):
+ qmsg[key] = [filter_qmp(atom, filter_fn) for atom in qmsg[key]]
+ elif isinstance(qmsg[key], dict):
+ qmsg[key] = filter_qmp(qmsg[key], filter_fn)
+ else:
+ qmsg[key] = filter_fn(key, qmsg[key])
+ return qmsg
+
def filter_testfiles(msg):
prefix = os.path.join(test_dir, "%s-" % (os.getpid()))
return msg.replace(prefix, 'TEST_DIR/PID-')
+def filter_qmp_testfiles(qmsg):
+ def _filter(key, value):
+ if key == 'filename' or key == 'backing-file':
+ return filter_testfiles(value)
+ return value
+ return filter_qmp(qmsg, _filter)
+
def filter_generated_node_ids(msg):
return re.sub("#block[0-9]+", "NODE_NAME", msg)
@@ -462,10 +481,9 @@ class VM(qtest.QEMUQtestMachine):
def qmp_log(self, cmd, filters=[], **kwargs):
full_cmd = OrderedDict({"execute": cmd,
"arguments": ordered_kwargs(kwargs)})
- logmsg = json.dumps(full_cmd)
- log(logmsg, filters)
+ log(full_cmd, filters)
result = self.qmp(cmd, **kwargs)
- log(json.dumps(result, sort_keys=True), filters)
+ log(result, filters)
return result
def run_job(self, job, auto_finalize=True, auto_dismiss=False):
--
2.17.2
- [Qemu-devel] [PATCH v4 2/5] iotests: remove default filters from qmp_log, (continued)
[Qemu-devel] [PATCH v4 3/5] iotests: change qmp_log filters to expect QMP objects only,
John Snow <=
- Re: [Qemu-devel] [PATCH v4 3/5] iotests: change qmp_log filters to expect QMP objects only, Vladimir Sementsov-Ogievskiy, 2018/12/19
- Re: [Qemu-devel] [PATCH v4 3/5] iotests: change qmp_log filters to expect QMP objects only, Vladimir Sementsov-Ogievskiy, 2018/12/19
- Re: [Qemu-devel] [PATCH v4 3/5] iotests: change qmp_log filters to expect QMP objects only, John Snow, 2018/12/19
- Re: [Qemu-devel] [PATCH v4 3/5] iotests: change qmp_log filters to expect QMP objects only, Eric Blake, 2018/12/19
- Re: [Qemu-devel] [PATCH v4 3/5] iotests: change qmp_log filters to expect QMP objects only, John Snow, 2018/12/19
- Re: [Qemu-devel] [PATCH v4 3/5] iotests: change qmp_log filters to expect QMP objects only, Vladimir Sementsov-Ogievskiy, 2018/12/20
Re: [Qemu-devel] [PATCH v4 3/5] iotests: change qmp_log filters to expect QMP objects only, John Snow, 2018/12/19
Re: [Qemu-devel] [PATCH v4 3/5] iotests: change qmp_log filters to expect QMP objects only, Vladimir Sementsov-Ogievskiy, 2018/12/20
[Qemu-devel] [PATCH v4 4/5] iotests: implement pretty-print for log and qmp_log, John Snow, 2018/12/18
[Qemu-devel] [PATCH v4 5/5] iotests: add iotest 236 for testing bitmap merge, John Snow, 2018/12/18