[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 17/25] iotests: replace unchecked calls to qemu_img_pipe()
From: |
Hanna Reitz |
Subject: |
[PULL 17/25] iotests: replace unchecked calls to qemu_img_pipe() |
Date: |
Tue, 22 Mar 2022 12:56:39 +0100 |
From: John Snow <jsnow@redhat.com>
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>
Message-Id: <20220321201618.903471-13-jsnow@redhat.com>
Signed-off-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.35.1
- [PULL 07/25] python/utils: add VerboseProcessError, (continued)
- [PULL 07/25] python/utils: add VerboseProcessError, Hanna Reitz, 2022/03/22
- [PULL 06/25] python/utils: add add_visual_margin() text decoration utility, Hanna Reitz, 2022/03/22
- [PULL 08/25] iotests: Remove explicit checks for qemu_img() == 0, Hanna Reitz, 2022/03/22
- [PULL 09/25] iotests: make qemu_img raise on non-zero rc by default, Hanna Reitz, 2022/03/22
- [PULL 11/25] iotests: add qemu_img_json(), Hanna Reitz, 2022/03/22
- [PULL 10/25] iotests: fortify compare_images() against crashes, Hanna Reitz, 2022/03/22
- [PULL 12/25] iotests: use qemu_img_json() when applicable, Hanna Reitz, 2022/03/22
- [PULL 13/25] iotests: add qemu_img_info(), Hanna Reitz, 2022/03/22
- [PULL 14/25] iotests/remove-bitmap-from-backing: use qemu_img_info(), Hanna Reitz, 2022/03/22
- [PULL 16/25] iotests: change supports_quorum to use qemu_img, Hanna Reitz, 2022/03/22
- [PULL 17/25] iotests: replace unchecked calls to qemu_img_pipe(),
Hanna Reitz <=
- [PULL 18/25] iotests/149: Remove qemu_img_pipe() call, Hanna Reitz, 2022/03/22
- [PULL 21/25] iotests: replace qemu_img_log('create', ...) calls, Hanna Reitz, 2022/03/22
- [PULL 20/25] iotests: use qemu_img() in has_working_luks(), Hanna Reitz, 2022/03/22
- [PULL 19/25] iotests: remove remaining calls to qemu_img_pipe(), Hanna Reitz, 2022/03/22
- [PULL 22/25] iotests: remove qemu_img_pipe_and_status(), Hanna Reitz, 2022/03/22
- [PULL 23/25] iotests: make qemu_img_log and img_info_log raise on error, Hanna Reitz, 2022/03/22
- [PULL 24/25] iotests.py: Filters for VM.run_job(), Hanna Reitz, 2022/03/22
- [PULL 25/25] iotests/207: Filter host fingerprint, Hanna Reitz, 2022/03/22
- [PULL 15/25] iotests: add qemu_img_map() function, Hanna Reitz, 2022/03/22
- Re: [PULL 00/25] Block patches for 7.0-rc1, Peter Maydell, 2022/03/22