Signed-off-by: Max Reitz <[email protected]> --- tests/qemu-iotests/258 | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/tests/qemu-iotests/258 b/tests/qemu-iotests/258 index 1372522c7a..3e9505d8d4 100755 --- a/tests/qemu-iotests/258 +++ b/tests/qemu-iotests/258 @@ -20,7 +20,7 @@ # Creator/Owner: Max Reitz <[email protected]> import iotests -from iotests import log, qemu_img, qemu_io_silent, \ +from iotests import log, create_test_image, qemu_io_silent, \ filter_qmp_testfiles, filter_qmp_imgfmt # Returns a node for blockdev-add @@ -65,22 +65,22 @@ def test_concurrent_finish(write_to_stream_node): # and the other way around, depending on whether the commit job # is finalized before stream completes or not. - with iotests.FilePath('node4.img') as node4_path, \ - iotests.FilePath('node3.img') as node3_path, \ - iotests.FilePath('node2.img') as node2_path, \ - iotests.FilePath('node1.img') as node1_path, \ - iotests.FilePath('node0.img') as node0_path, \ + with iotests.ImagePath('node4.img') as node4_path, \ + iotests.ImagePath('node3.img') as node3_path, \ + iotests.ImagePath('node2.img') as node2_path, \ + iotests.ImagePath('node1.img') as node1_path, \ + iotests.ImagePath('node0.img') as node0_path, \ iotests.VM() as vm: # It is important to use raw for the base layer (so that # permissions are just handed through to the protocol layer) - assert qemu_img('create', '-f', 'raw', node0_path, '64M') == 0 + assert create_test_image(node0_path, '64M', fmt='raw') == 0 stream_throttle=None commit_throttle=None for path in [node1_path, node2_path, node3_path, node4_path]: - assert qemu_img('create', '-f', iotests.imgfmt, path, '64M') == 0 + assert create_test_image(path, '64M') == 0 if write_to_stream_node: # This is what (most of the time) makes commit finish -- 2.21.0
