mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iotests: add filter_qmp_generated_node_ids()

Browse Source 
Add a filter function for QMP responses that contain QEMU's
automatically generated node ids. The ids change between runs and must
be masked in the reference output.

The next commit will use this new function.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-ID: <20240118144823.1497953-2-stefanha@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
(cherry picked from commit da62b507a2)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
(Mjt: context fix in tests/qemu-iotests/iotests.py due to
 v7.2.0-939-gbcc6777ad6 "iotests: Filter child node information")
This commit is contained in:
Stefan Hajnoczi 2024-01-18 09:48:21 -05:00 committed by Michael Tokarev
parent e9eb53c5fe
commit 3b53bfd4c8
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -642,6 +642,13 @@ def filter_qmp_virtio_scsi(qmsg):
def filter_generated_node_ids(msg): def filter_generated_node_ids(msg):
return re.sub("#block[0-9]+", "NODE_NAME", msg) return re.sub("#block[0-9]+", "NODE_NAME", msg)
def filter_qmp_generated_node_ids(qmsg):
def _filter(_key, value):
if is_str(value):
return filter_generated_node_ids(value)
return value
return filter_qmp(qmsg, _filter)
def filter_img_info(output, filename): def filter_img_info(output, filename):
lines = [] lines = []
for line in output.split('\n'): for line in output.split('\n'):