Skip to content

Commit

Permalink
iotests: add filter_qmp_generated_node_ids()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
stefanhaRH authored and kevmw committed Jan 26, 2024
1 parent 72098a3 commit da62b50
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions tests/qemu-iotests/iotests.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 = []
Expand Down

0 comments on commit da62b50

Please sign in to comment.