[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 12/18] iotests: replace unchecked calls to qemu_img_pipe()
From: |
John Snow |
Subject: |
[PATCH v2 12/18] iotests: replace unchecked calls to qemu_img_pipe() |
Date: |
Mon, 21 Feb 2022 17:34:07 -0500 |
qemu_img_pipe() discards the return code in favor of returning just the
output. Some tests using this function don't save, log, or check the
output either, though. Replace those calls to a checked version as
appropriate.
Tests affected are 194, 202, 203, 234, 262, and 303.
Signed-off-by: John Snow <jsnow@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 e44b8df7280..68894371f51 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 8eb5f32d153..b784dcd791a 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 ea30e504976..ab80fd0e44a 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 cb5f1753e08..a9f764bb2c6 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 32d69988ef7..2294fd5ecbd 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 16c2e108276..93aa5ce9b7d 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 v2 01/18] python/utils: add enboxify() text decoration utility, (continued)
- [PATCH v2 01/18] python/utils: add enboxify() text decoration utility, John Snow, 2022/02/21
- [PATCH v2 03/18] iotests: Remove explicit checks for qemu_img() == 0, John Snow, 2022/02/21
- [PATCH v2 05/18] iotests: fortify compare_images() against crashes, John Snow, 2022/02/21
- [PATCH v2 06/18] iotests: add qemu_img_json(), John Snow, 2022/02/21
- [PATCH v2 04/18] iotests: make qemu_img raise on non-zero rc by default, John Snow, 2022/02/21
- [PATCH v2 07/18] iotests: use qemu_img_json() when applicable, John Snow, 2022/02/21
- [PATCH v2 08/18] iotests: add qemu_img_info(), John Snow, 2022/02/21
- [PATCH v2 09/18] iotests: remove-bitmap-from-backing: use qemu_img_info(), John Snow, 2022/02/21
- [PATCH v2 10/18] iotests: add qemu_img_map() function, John Snow, 2022/02/21
- [PATCH v2 11/18] iotests: change supports_quorum to use qemu_img, John Snow, 2022/02/21
- [PATCH v2 12/18] iotests: replace unchecked calls to qemu_img_pipe(),
John Snow <=
- [PATCH v2 13/18] iotests: remove external calls to qemu_img_pipe(), John Snow, 2022/02/21
- [PATCH v2 14/18] iotests: move has_working_luks onto qemu_img(), John Snow, 2022/02/21
- [PATCH v2 15/18] iotests: remove qemu_img_log('create', ...) calls, John Snow, 2022/02/21
- [PATCH v2 16/18] iotests: remove qemu_img_pipe(), John Snow, 2022/02/21
- [PATCH v2 18/18] iotests: reimplement img_info_log in terms of qemu_img_log, John Snow, 2022/02/21
- [PATCH v2 17/18] iotests: make qemu_img_log() check log level, John Snow, 2022/02/21