[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 05/14] iotests: add filter_qmp_generated_node_ids()
From: |
Kevin Wolf |
Subject: |
[PULL 05/14] iotests: add filter_qmp_generated_node_ids() |
Date: |
Fri, 19 Jan 2024 19:13:18 +0100 |
From: Stefan Hajnoczi <stefanha@redhat.com>
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>
---
tests/qemu-iotests/iotests.py | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index e5c5798c71..ea48af4a7b 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -651,6 +651,13 @@ def _filter(_key, value):
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 = []
--
2.43.0
- [PULL 00/14] Block layer patches, Kevin Wolf, 2024/01/19
- [PULL 03/14] commit: Allow users to request only format driver names in backing file format, Kevin Wolf, 2024/01/19
- [PULL 01/14] block/blklogwrites: Fix a bug when logging "write zeroes" operations., Kevin Wolf, 2024/01/19
- [PULL 08/14] virtio-blk: move dataplane code into virtio-blk.c, Kevin Wolf, 2024/01/19
- [PULL 10/14] virtio-blk: rename dataplane to ioeventfd, Kevin Wolf, 2024/01/19
- [PULL 05/14] iotests: add filter_qmp_generated_node_ids(),
Kevin Wolf <=
- [PULL 02/14] string-output-visitor: Fix (pseudo) struct handling, Kevin Wolf, 2024/01/19
- [PULL 06/14] iotests: port 141 to Python for reliable QMP testing, Kevin Wolf, 2024/01/19
- [PULL 09/14] virtio-blk: rename dataplane create/destroy functions, Kevin Wolf, 2024/01/19
- [PULL 07/14] monitor: only run coroutine commands in qemu_aio_context, Kevin Wolf, 2024/01/19
- [PULL 04/14] stream: Allow users to request only format driver names in backing file format, Kevin Wolf, 2024/01/19
- [PULL 14/14] block/blklogwrites: Protect mutable driver state with a mutex., Kevin Wolf, 2024/01/19
- [PULL 12/14] virtio-blk: tolerate failure to set BlockBackend AioContext, Kevin Wolf, 2024/01/19
- [PULL 13/14] virtio-blk: always set ioeventfd during startup, Kevin Wolf, 2024/01/19
- [PULL 11/14] virtio-blk: restart s->rq reqs in vq AioContexts, Kevin Wolf, 2024/01/19
- Re: [PULL 00/14] Block layer patches, Peter Maydell, 2024/01/20