[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 14/25] iotests/remove-bitmap-from-backing: use qemu_img_info()
From: |
Hanna Reitz |
Subject: |
[PULL 14/25] iotests/remove-bitmap-from-backing: use qemu_img_info() |
Date: |
Tue, 22 Mar 2022 12:56:36 +0100 |
From: John Snow <jsnow@redhat.com>
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>
Message-Id: <20220321201618.903471-10-jsnow@redhat.com>
Signed-off-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.35.1
- [PULL 04/25] tests: Do not treat the iotests as separate meson test target anymore, (continued)
- [PULL 04/25] tests: Do not treat the iotests as separate meson test target anymore, Hanna Reitz, 2022/03/22
- [PULL 05/25] tests/qemu-iotests/testrunner: Supply a test plan in TAP mode, Hanna Reitz, 2022/03/22
- [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 <=
- [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, 2022/03/22
- [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