[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 09/18] iotests/remove-bitmap-from-backing: use qemu_img_info()
From: |
John Snow |
Subject: |
[PATCH v5 09/18] iotests/remove-bitmap-from-backing: use qemu_img_info() |
Date: |
Mon, 21 Mar 2022 16:16:09 -0400 |
This removes two more usages of qemu_img_pipe() and replaces them with
calls to qemu_img(), which provides better diagnostic information on
failure.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
---
tests/qemu-iotests/tests/remove-bitmap-from-backing | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/qemu-iotests/tests/remove-bitmap-from-backing
b/tests/qemu-iotests/tests/remove-bitmap-from-backing
index fee3141340..15be32dcb9 100755
--- a/tests/qemu-iotests/tests/remove-bitmap-from-backing
+++ b/tests/qemu-iotests/tests/remove-bitmap-from-backing
@@ -19,7 +19,7 @@
#
import iotests
-from iotests import log, qemu_img_create, qemu_img, qemu_img_pipe
+from iotests import log, qemu_img_create, qemu_img, qemu_img_info
iotests.script_initialize(supported_fmts=['qcow2'],
unsupported_imgopts=['compat'])
@@ -33,7 +33,7 @@ qemu_img_create('-f', iotests.imgfmt, '-b', base,
qemu_img('bitmap', '--add', base, 'bitmap0')
# Just assert that our method of checking bitmaps in the image works.
-assert 'bitmaps' in qemu_img_pipe('info', base)
+assert 'bitmaps' in qemu_img_info(base)['format-specific']['data']
vm = iotests.VM().add_drive(top, 'backing.node-name=base')
vm.launch()
@@ -68,5 +68,5 @@ if result != {'return': {}}:
vm.shutdown()
-if 'bitmaps' in qemu_img_pipe('info', base):
+if 'bitmaps' in qemu_img_info(base)['format-specific']['data']:
log('ERROR: Bitmap is still in the base image')
--
2.34.1
- [PATCH v5 00/18] iotests: add enhanced debugging info to qemu-img failures, John Snow, 2022/03/21
- [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 <=
- [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, 2022/03/21
- [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