Signed-off-by: Max Reitz <[email protected]> --- tests/qemu-iotests/228 | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/tests/qemu-iotests/228 b/tests/qemu-iotests/228 index e507db4f27..ad7966fc8f 100755 --- a/tests/qemu-iotests/228 +++ b/tests/qemu-iotests/228 @@ -21,8 +21,9 @@ # Creator/Owner: Max Reitz <[email protected]> import iotests -from iotests import log, qemu_img, filter_testfiles, filter_imgfmt, \ - filter_qmp_testfiles, filter_qmp_imgfmt, filter_json_filename +from iotests import log, create_test_image, remove_test_image, \ + filter_testfiles, filter_imgfmt, filter_qmp_testfiles, \ + filter_qmp_imgfmt, filter_json_filename # Need backing file and change-backing-file support iotests.script_initialize(supported_fmts=['qcow2', 'qed']) @@ -46,14 +47,14 @@ def log_node_info(node): log('') -with iotests.FilePath('base.img') as base_img_path, \ - iotests.FilePath('top.img') as top_img_path, \ +with iotests.ImagePath('base.img') as base_img_path, \ + iotests.ImagePath('top.img') as top_img_path, \ iotests.VM() as vm: - assert qemu_img('create', '-f', iotests.imgfmt, base_img_path, '64M') == 0 + assert create_test_image(base_img_path, '64M') == 0 # Choose a funny way to describe the backing filename - assert qemu_img('create', '-f', iotests.imgfmt, '-b', - 'file:' + base_img_path, top_img_path) == 0 + assert create_test_image(top_img_path, + backing_file=('file:' + base_img_path)) == 0 vm.launch() @@ -167,8 +168,8 @@ with iotests.FilePath('base.img') as base_img_path, \ # (because qemu cannot "canonicalize"/"resolve" the backing # filename unless the backing file is opened implicitly with the # overlay) - assert qemu_img('create', '-f', iotests.imgfmt, '-b', base_img_path, - top_img_path) == 0 + remove_test_image(top_img_path) + assert create_test_image(top_img_path, backing_file=base_img_path) == 0 # You can only reliably override backing options by using a node # reference (or by specifying file.filename, but, well...) -- 2.21.0
