iotests/remove-bitmap-from-backing: use qemu_img_info()
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:
parent
9ebb2b765b
commit
ac5bb4861c
@ -19,7 +19,7 @@
|
||||
#
|
||||
|
||||
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'],
|
||||
unsupported_imgopts=['compat'])
|
||||
@ -33,7 +33,7 @@ qemu_img_create('-f', iotests.imgfmt, '-b', base,
|
||||
|
||||
qemu_img('bitmap', '--add', base, 'bitmap0')
|
||||
# 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.launch()
|
||||
@ -68,5 +68,5 @@ if result != {'return': {}}:
|
||||
|
||||
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')
|
||||
|
Loading…
Reference in New Issue
Block a user