[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 12/18] iotests: replace unchecked calls to qemu_img_pipe()
From: |
John Snow |
Subject: |
[PATCH v5 12/18] iotests: replace unchecked calls to qemu_img_pipe() |
Date: |
Mon, 21 Mar 2022 16:16:12 -0400 |
qemu_img_pipe() discards the return code from qemu-img in favor of
returning just its output. Some tests using this function don't save,
log, or check the output either, though, which is unsafe.
Replace all of these calls with a checked version.
Tests affected are 194, 202, 203, 234, 262, and 303.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
---
tests/qemu-iotests/194 | 4 ++--
tests/qemu-iotests/202 | 4 ++--
tests/qemu-iotests/203 | 4 ++--
tests/qemu-iotests/234 | 4 ++--
tests/qemu-iotests/262 | 2 +-
tests/qemu-iotests/303 | 2 +-
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/tests/qemu-iotests/194 b/tests/qemu-iotests/194
index e44b8df728..68894371f5 100755
--- a/tests/qemu-iotests/194
+++ b/tests/qemu-iotests/194
@@ -33,8 +33,8 @@ with iotests.FilePath('source.img') as source_img_path, \
iotests.VM('dest') as dest_vm:
img_size = '1G'
- iotests.qemu_img_pipe('create', '-f', iotests.imgfmt, source_img_path,
img_size)
- iotests.qemu_img_pipe('create', '-f', iotests.imgfmt, dest_img_path,
img_size)
+ iotests.qemu_img_create('-f', iotests.imgfmt, source_img_path, img_size)
+ iotests.qemu_img_create('-f', iotests.imgfmt, dest_img_path, img_size)
iotests.log('Launching VMs...')
(source_vm.add_drive(source_img_path)
diff --git a/tests/qemu-iotests/202 b/tests/qemu-iotests/202
index 8eb5f32d15..b784dcd791 100755
--- a/tests/qemu-iotests/202
+++ b/tests/qemu-iotests/202
@@ -35,8 +35,8 @@ with iotests.FilePath('disk0.img') as disk0_img_path, \
iotests.VM() as vm:
img_size = '10M'
- iotests.qemu_img_pipe('create', '-f', iotests.imgfmt, disk0_img_path,
img_size)
- iotests.qemu_img_pipe('create', '-f', iotests.imgfmt, disk1_img_path,
img_size)
+ iotests.qemu_img_create('-f', iotests.imgfmt, disk0_img_path, img_size)
+ iotests.qemu_img_create('-f', iotests.imgfmt, disk1_img_path, img_size)
iotests.log('Launching VM...')
vm.launch()
diff --git a/tests/qemu-iotests/203 b/tests/qemu-iotests/203
index ea30e50497..ab80fd0e44 100755
--- a/tests/qemu-iotests/203
+++ b/tests/qemu-iotests/203
@@ -33,8 +33,8 @@ with iotests.FilePath('disk0.img') as disk0_img_path, \
iotests.VM() as vm:
img_size = '10M'
- iotests.qemu_img_pipe('create', '-f', iotests.imgfmt, disk0_img_path,
img_size)
- iotests.qemu_img_pipe('create', '-f', iotests.imgfmt, disk1_img_path,
img_size)
+ iotests.qemu_img_create('-f', iotests.imgfmt, disk0_img_path, img_size)
+ iotests.qemu_img_create('-f', iotests.imgfmt, disk1_img_path, img_size)
iotests.log('Launching VM...')
(vm.add_object('iothread,id=iothread0')
diff --git a/tests/qemu-iotests/234 b/tests/qemu-iotests/234
index cb5f1753e0..a9f764bb2c 100755
--- a/tests/qemu-iotests/234
+++ b/tests/qemu-iotests/234
@@ -34,8 +34,8 @@ with iotests.FilePath('img') as img_path, \
iotests.VM(path_suffix='a') as vm_a, \
iotests.VM(path_suffix='b') as vm_b:
- iotests.qemu_img_pipe('create', '-f', iotests.imgfmt, backing_path, '64M')
- iotests.qemu_img_pipe('create', '-f', iotests.imgfmt, img_path, '64M')
+ iotests.qemu_img_create('-f', iotests.imgfmt, backing_path, '64M')
+ iotests.qemu_img_create('-f', iotests.imgfmt, img_path, '64M')
os.mkfifo(fifo_a)
os.mkfifo(fifo_b)
diff --git a/tests/qemu-iotests/262 b/tests/qemu-iotests/262
index 32d69988ef..2294fd5ecb 100755
--- a/tests/qemu-iotests/262
+++ b/tests/qemu-iotests/262
@@ -51,7 +51,7 @@ with iotests.FilePath('img') as img_path, \
vm.add_device('virtio-blk,drive=%s,iothread=iothread0' % root)
- iotests.qemu_img_pipe('create', '-f', iotests.imgfmt, img_path, '64M')
+ iotests.qemu_img_create('-f', iotests.imgfmt, img_path, '64M')
os.mkfifo(fifo)
diff --git a/tests/qemu-iotests/303 b/tests/qemu-iotests/303
index 16c2e10827..93aa5ce9b7 100755
--- a/tests/qemu-iotests/303
+++ b/tests/qemu-iotests/303
@@ -38,7 +38,7 @@ def create_bitmap(bitmap_number, disabled):
if disabled:
args.append('--disable')
- iotests.qemu_img_pipe(*args)
+ iotests.qemu_img(*args)
def write_to_disk(offset, size):
--
2.34.1
- [PATCH v5 01/18] python/utils: add add_visual_margin() text decoration utility, (continued)
- [PATCH v5 01/18] python/utils: add add_visual_margin() text decoration utility, John Snow, 2022/03/21
- [PATCH v5 05/18] iotests: fortify compare_images() against crashes, John Snow, 2022/03/21
- [PATCH v5 07/18] iotests: use qemu_img_json() when applicable, John Snow, 2022/03/21
- [PATCH v5 02/18] python/utils: add VerboseProcessError, John Snow, 2022/03/21
- [PATCH v5 06/18] iotests: add qemu_img_json(), John Snow, 2022/03/21
- [PATCH v5 09/18] iotests/remove-bitmap-from-backing: use qemu_img_info(), John Snow, 2022/03/21
- [PATCH v5 04/18] iotests: make qemu_img raise on non-zero rc by default, John Snow, 2022/03/21
- [PATCH v5 03/18] iotests: Remove explicit checks for qemu_img() == 0, John Snow, 2022/03/21
- [PATCH v5 11/18] iotests: change supports_quorum to use qemu_img, John Snow, 2022/03/21
- [PATCH v5 08/18] iotests: add qemu_img_info(), John Snow, 2022/03/21
- [PATCH v5 12/18] iotests: replace unchecked calls to qemu_img_pipe(),
John Snow <=
- [PATCH v5 13/18] iotests/149: Remove qemu_img_pipe() call, John Snow, 2022/03/21
- [PATCH v5 10/18] iotests: add qemu_img_map() function, John Snow, 2022/03/21
- [PATCH v5 15/18] iotests: use qemu_img() in has_working_luks(), John Snow, 2022/03/21
- [PATCH v5 16/18] iotests: replace qemu_img_log('create', ...) calls, John Snow, 2022/03/21
- [PATCH v5 14/18] iotests: remove remaining calls to qemu_img_pipe(), John Snow, 2022/03/21
- [PATCH v5 18/18] iotests: make qemu_img_log and img_info_log raise on error, John Snow, 2022/03/21
- [PATCH v5 17/18] iotests: remove qemu_img_pipe_and_status(), John Snow, 2022/03/21
- Re: [PATCH v5 00/18] iotests: add enhanced debugging info to qemu-img failures, Hanna Reitz, 2022/03/22