From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>, John Snow <jsnow@redhat.com>,
Hanna Reitz <hreitz@redhat.com>, Eric Blake <eblake@redhat.com>,
qemu-block@nongnu.org
Subject: [PATCH 06/14] iotests: change supports_quorum to use qemu_img
Date: Tue, 8 Mar 2022 22:53:59 -0500 [thread overview]
Message-ID: <20220309035407.1848654-7-jsnow@redhat.com> (raw)
In-Reply-To: <20220309035407.1848654-1-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>
---
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 3896440238..698d5a7fdc 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -1433,8 +1433,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.34.1
next prev parent reply other threads:[~2022-03-09 4:01 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-09 3:53 [PATCH 00/14] iotests: ensure all qemu-img calls are either checked or logged John Snow
2022-03-09 3:53 ` [PATCH 01/14] iotests: add qemu_img_json() John Snow
2022-03-17 10:53 ` Hanna Reitz
2022-03-17 14:42 ` John Snow
2022-03-17 14:51 ` Hanna Reitz
2022-03-17 15:30 ` John Snow
2022-03-09 3:53 ` [PATCH 02/14] iotests: use qemu_img_json() when applicable John Snow
2022-03-17 10:59 ` Hanna Reitz
2022-03-09 3:53 ` [PATCH 03/14] iotests: add qemu_img_info() John Snow
2022-03-17 11:09 ` Hanna Reitz
2022-03-17 14:51 ` John Snow
2022-03-09 3:53 ` [PATCH 04/14] iotests/remove-bitmap-from-backing: use qemu_img_info() John Snow
2022-03-17 11:19 ` Hanna Reitz
2022-03-09 3:53 ` [PATCH 05/14] iotests: add qemu_img_map() function John Snow
2022-03-17 11:26 ` Hanna Reitz
2022-03-09 3:53 ` John Snow [this message]
2022-03-17 11:35 ` [PATCH 06/14] iotests: change supports_quorum to use qemu_img Hanna Reitz
2022-03-09 3:54 ` [PATCH 07/14] iotests: replace unchecked calls to qemu_img_pipe() John Snow
2022-03-17 11:38 ` Hanna Reitz
2022-03-09 3:54 ` [PATCH 08/14] iotests/149: Remove qemu_img_pipe() call John Snow
2022-03-17 12:09 ` Hanna Reitz
2022-03-09 3:54 ` [PATCH 09/14] iotests: remove remaining calls to qemu_img_pipe() John Snow
2022-03-17 12:43 ` Hanna Reitz
2022-03-09 3:54 ` [PATCH 10/14] iotests: use qemu_img() in has_working_luks() John Snow
2022-03-17 13:13 ` Hanna Reitz
2022-03-09 3:54 ` [PATCH 11/14] iotests: replace qemu_img_log('create', ...) calls John Snow
2022-03-17 14:44 ` Hanna Reitz
2022-03-09 3:54 ` [PATCH 12/14] iotests: remove qemu_img_pipe_and_status() John Snow
2022-03-17 15:28 ` Hanna Reitz
2022-03-17 15:58 ` John Snow
2022-03-17 16:04 ` Hanna Reitz
2022-03-17 17:10 ` John Snow
2022-03-09 3:54 ` [PATCH 13/14] iotests: make qemu_img_log() check log level John Snow
2022-03-17 15:34 ` Hanna Reitz
2022-03-09 3:54 ` [PATCH 14/14] iotests: make img_info_log() call qemu_img_log() John Snow
2022-03-17 15:38 ` Hanna Reitz
2022-03-17 17:00 ` John Snow
2022-03-17 17:45 ` John Snow
2022-03-17 18:26 ` Hanna Reitz
2022-03-17 18:32 ` John Snow
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220309035407.1848654-7-jsnow@redhat.com \
--to=jsnow@redhat.com \
--cc=eblake@redhat.com \
--cc=hreitz@redhat.com \
--cc=kwolf@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).