diff options
| author | John Snow <jsnow@redhat.com> | 2022-03-21 16:16:16 -0400 |
|---|---|---|
| committer | Hanna Reitz <hreitz@redhat.com> | 2022-03-22 10:14:41 +0100 |
| commit | 3c8b7358d6b5b887473b17b8528e042f9581e7b4 (patch) | |
| tree | 6d37f3ece98e911ecaf3cfcca50da24526dc43b5 /tests/qemu-iotests/255 | |
| parent | 97576f8c0a0870578a214caa7a138f929f74166e (diff) | |
| download | qemu-3c8b7358d6b5b887473b17b8528e042f9581e7b4.zip qemu-3c8b7358d6b5b887473b17b8528e042f9581e7b4.tar.gz qemu-3c8b7358d6b5b887473b17b8528e042f9581e7b4.tar.bz2 | |
iotests: replace qemu_img_log('create', ...) calls
qemu_img_log() calls into qemu_img_pipe(), which always removes output
for 'create' commands on success anyway. Replace all of these calls to
the simpler qemu_img_create(...) which doesn't log, but raises a
detailed exception object on failure instead.
Blank lines are removed from output files where appropriate.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
Message-Id: <20220321201618.903471-17-jsnow@redhat.com>
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
Diffstat (limited to 'tests/qemu-iotests/255')
| -rwxr-xr-x | tests/qemu-iotests/255 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/qemu-iotests/255 b/tests/qemu-iotests/255 index 3d6d0e8..f86fa85 100755 --- a/tests/qemu-iotests/255 +++ b/tests/qemu-iotests/255 @@ -42,8 +42,8 @@ with iotests.FilePath('t.qcow2') as disk_path, \ size_str = str(size) iotests.create_image(base_path, size) - iotests.qemu_img_log('create', '-f', iotests.imgfmt, mid_path, size_str) - iotests.qemu_img_log('create', '-f', iotests.imgfmt, disk_path, size_str) + iotests.qemu_img_create('-f', iotests.imgfmt, mid_path, size_str) + iotests.qemu_img_create('-f', iotests.imgfmt, disk_path, size_str) # Create a backing chain like this: # base <- [throttled: bps-read=4096] <- mid <- overlay @@ -92,8 +92,8 @@ with iotests.FilePath('src.qcow2') as src_path, \ size = 128 * 1024 * 1024 size_str = str(size) - iotests.qemu_img_log('create', '-f', iotests.imgfmt, src_path, size_str) - iotests.qemu_img_log('create', '-f', iotests.imgfmt, dst_path, size_str) + iotests.qemu_img_create('-f', iotests.imgfmt, src_path, size_str) + iotests.qemu_img_create('-f', iotests.imgfmt, dst_path, size_str) iotests.log(iotests.qemu_io('-f', iotests.imgfmt, '-c', 'write 0 1M', src_path), |