ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

iotests: remove default filters from qmp_log 

Several places in iotests deal with serializing objects into JSON
strings, but to add pretty-printing it seems desirable to localize
all of those cases.

log() seems like a good candidate for that centralized behavior.
log() can already serialize json objects, but when it does so,
it assumes filters=[] operates on QMP objects, not strings.

qmp_log currently operates by dumping outgoing and incoming QMP
objects into strings and filtering them assuming that filters=[]
are string filters.

To have qmp_log use log's serialization, qmp_log will need to
accept only qmp filters, not text filters.

However, only a single caller of qmp_log actually requires any
filters at all. I remove the default filter and add it explicitly
to the caller in preparation for refactoring qmp_log to use rich
filters instead.

test 206 is amended to name the filter explicitly and the default
is removed.

Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20181221093529.23855-9-jsnow@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
John Snow 2018-12-21 04:35:26 -05:00 committed by Eric Blake
parent 0706e87d72
commit f8ca8609d8
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/qemu-iotests/206
View File

@ -26,7 +26,9 @@ from iotests import imgfmt
iotests.verify_image_format(supported_fmts=['qcow2']) iotests.verify_image_format(supported_fmts=['qcow2'])
def blockdev_create(vm, options): def blockdev_create(vm, options):
result = vm.qmp_log('blockdev-create', job_id='job0', options=options) result = vm.qmp_log('blockdev-create',
filters=[iotests.filter_testfiles],
job_id='job0', options=options)
if 'return' in result: if 'return' in result:
assert result['return'] == {} assert result['return'] == {}
@ -52,7 +54,9 @@ with iotests.FilePath('t.qcow2') as disk_path, \
'filename': disk_path, 'filename': disk_path,
'size': 0 }) 'size': 0 })
vm.qmp_log('blockdev-add', driver='file', filename=disk_path, vm.qmp_log('blockdev-add',
filters=[iotests.filter_testfiles],
driver='file', filename=disk_path,
node_name='imgfile') node_name='imgfile')
blockdev_create(vm, { 'driver': imgfmt, blockdev_create(vm, { 'driver': imgfmt,

2
tests/qemu-iotests/iotests.py
View File

@ -460,7 +460,7 @@ class VM(qtest.QEMUQtestMachine):
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): def qmp_log(self, cmd, filters=[], **kwargs):
full_cmd = OrderedDict(( full_cmd = OrderedDict((
("execute", cmd), ("execute", cmd),
("arguments", ordered_kwargs(kwargs)) ("arguments", ordered_kwargs(kwargs))