aboutsummaryrefslogtreecommitdiff
path: root/tests/qemu-iotests/242
diff options
context:
space:
mode:
authorJohn Snow <jsnow@redhat.com>2022-03-21 16:16:08 -0400
committerHanna Reitz <hreitz@redhat.com>2022-03-22 10:14:31 +0100
commit9ebb2b765b0d6c6fd5228a736e31acfc10a56315 (patch)
tree9956298a213712d79f739ec51209b3505711329c /tests/qemu-iotests/242
parent0f7d7d72aa99c8e48bbbf37262a9c66c83113f76 (diff)
iotests: add qemu_img_info()
Add qemu_img_info() by analogy with qemu_img_measure() and qemu_img_check(). Modify image_size() to use this function instead to take advantage of the better diagnostic information on failure provided (ultimately) by qemu_img(). Signed-off-by: John Snow <jsnow@redhat.com> Reviewed-by: Hanna Reitz <hreitz@redhat.com> Message-Id: <20220321201618.903471-9-jsnow@redhat.com> Signed-off-by: Hanna Reitz <hreitz@redhat.com>
Diffstat (limited to 'tests/qemu-iotests/242')
-rwxr-xr-xtests/qemu-iotests/2425
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/qemu-iotests/242 b/tests/qemu-iotests/242
index 96a30152b0..547bf382e3 100755
--- a/tests/qemu-iotests/242
+++ b/tests/qemu-iotests/242
@@ -22,7 +22,7 @@
import iotests
import json
import struct
-from iotests import qemu_img_create, qemu_io, qemu_img_pipe, \
+from iotests import qemu_img_create, qemu_io, qemu_img_info, \
file_path, img_info_log, log, filter_qemu_io
iotests.script_initialize(supported_fmts=['qcow2'],
@@ -39,8 +39,7 @@ flag_offset = 0x5000f
def print_bitmap(extra_args):
log('qemu-img info dump:\n')
img_info_log(disk, extra_args=extra_args)
- result = json.loads(qemu_img_pipe('info', '--force-share',
- '--output=json', disk))
+ result = qemu_img_info('--force-share', disk)
if 'bitmaps' in result['format-specific']['data']:
bitmaps = result['format-specific']['data']['bitmaps']
log('The same bitmaps in JSON format:')