[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 16/25] iotests: change supports_quorum to use qemu_img
From: |
Hanna Reitz |
Subject: |
[PULL 16/25] iotests: change supports_quorum to use qemu_img |
Date: |
Tue, 22 Mar 2022 12:56:38 +0100 |
From: John Snow <jsnow@redhat.com>
Similar to other recent changes: use the qemu_img() invocation that
supports throwing loud, nasty exceptions when it fails for surprising
reasons.
(Why would "--help" ever fail? I don't know, but eliminating *all* calls
to qemu-img that do not go through qemu_img() is my goal, so
qemu_img_pipe() has to be removed.)
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
Message-Id: <20220321201618.903471-12-jsnow@redhat.com>
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
---
tests/qemu-iotests/iotests.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index b3e793f78a..aaf4da8be4 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -1428,8 +1428,8 @@ def _verify_imgopts(unsupported: Sequence[str] = ()) ->
None:
notrun(f'not suitable for this imgopts: {imgopts}')
-def supports_quorum():
- return 'quorum' in qemu_img_pipe('--help')
+def supports_quorum() -> bool:
+ return 'quorum' in qemu_img('--help').stdout
def verify_quorum():
'''Skip test suite if quorum support is not available'''
--
2.35.1
- [PULL 05/25] tests/qemu-iotests/testrunner: Supply a test plan in TAP mode, (continued)
- [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, 2022/03/22
- [PULL 16/25] iotests: change supports_quorum to use qemu_img,
Hanna Reitz <=
- [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
- [PULL 15/25] iotests: add qemu_img_map() function, Hanna Reitz, 2022/03/22