OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

iotests/remove-bitmap-from-backing: use qemu_img_info()

Browse Source 
This removes two more usages of qemu_img_pipe() and replaces them with
calls to qemu_img(), which provides better diagnostic information on
failure.

Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
Message-Id: <20220321201618.903471-10-jsnow@redhat.com>
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
This commit is contained in:
John Snow 2022-03-21 16:16:09 -04:00 committed by Hanna Reitz
parent 9ebb2b765b
commit ac5bb4861c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/qemu-iotests/tests/remove-bitmap-from-backing
View File

@ -19,7 +19,7 @@
# #
import iotests import iotests
from iotests import log, qemu_img_create, qemu_img, qemu_img_pipe from iotests import log, qemu_img_create, qemu_img, qemu_img_info
iotests.script_initialize(supported_fmts=['qcow2'], iotests.script_initialize(supported_fmts=['qcow2'],
unsupported_imgopts=['compat']) unsupported_imgopts=['compat'])
@ -33,7 +33,7 @@ qemu_img_create('-f', iotests.imgfmt, '-b', base,
qemu_img('bitmap', '--add', base, 'bitmap0') qemu_img('bitmap', '--add', base, 'bitmap0')
# Just assert that our method of checking bitmaps in the image works. # Just assert that our method of checking bitmaps in the image works.
assert 'bitmaps' in qemu_img_pipe('info', base) assert 'bitmaps' in qemu_img_info(base)['format-specific']['data']
vm = iotests.VM().add_drive(top, 'backing.node-name=base') vm = iotests.VM().add_drive(top, 'backing.node-name=base')
vm.launch() vm.launch()
@ -68,5 +68,5 @@ if result != {'return': {}}:
vm.shutdown() vm.shutdown()
if 'bitmaps' in qemu_img_pipe('info', base): if 'bitmaps' in qemu_img_info(base)['format-specific']['data']:
log('ERROR: Bitmap is still in the base image') log('ERROR: Bitmap is still in the base image')