aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Hajnoczi <stefanha@redhat.com>2024-01-18 09:48:21 -0500
committerMichael Tokarev <mjt@tls.msk.ru>2024-01-26 19:31:37 +0300
commit03bc938fbfcde3cdc11eb00d30b407d2dd80448d (patch)
treed3147ee45fd04bf17125c51d0062a55bc7ae9278
parent23a512f418daa8daca774535eb5af33c4bc04640 (diff)
downloadqemu-03bc938fbfcde3cdc11eb00d30b407d2dd80448d.zip
qemu-03bc938fbfcde3cdc11eb00d30b407d2dd80448d.tar.gz
qemu-03bc938fbfcde3cdc11eb00d30b407d2dd80448d.tar.bz2
iotests: add filter_qmp_generated_node_ids()
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 da62b507a20510d819bcfbe8f5e573409b954006) Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
-rw-r--r--tests/qemu-iotests/iotests.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index ef66fbd..1dd41e6 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -646,6 +646,13 @@ def filter_qmp_virtio_scsi(qmsg):
def filter_generated_node_ids(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: str, filename: str,
drop_child_info: bool = True) -> str:
lines = []