From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>, Beraldo Leal <bleal@redhat.com>,
qemu-block@nongnu.org, John Snow <jsnow@redhat.com>,
Hanna Reitz <hreitz@redhat.com>, Cleber Rosa <crosa@redhat.com>,
Eric Blake <eblake@redhat.com>
Subject: [PATCH v5 07/18] iotests: use qemu_img_json() when applicable
Date: Mon, 21 Mar 2022 16:16:07 -0400 [thread overview]
Message-ID: <20220321201618.903471-8-jsnow@redhat.com> (raw)
In-Reply-To: <20220321201618.903471-1-jsnow@redhat.com>
qemu_img_json() gives better diagnostic information on failure.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
---
tests/qemu-iotests/iotests.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index 56aa068277..4725313150 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -309,11 +309,11 @@ def qemu_img_json(*args: str) -> Any:
return json.loads(res.stdout)
-def qemu_img_measure(*args):
- return json.loads(qemu_img_pipe("measure", "--output", "json", *args))
+def qemu_img_measure(*args: str) -> Any:
+ return qemu_img_json("measure", "--output", "json", *args)
-def qemu_img_check(*args):
- return json.loads(qemu_img_pipe("check", "--output", "json", *args))
+def qemu_img_check(*args: str) -> Any:
+ return qemu_img_json("check", "--output", "json", *args)
def qemu_img_pipe(*args: str) -> str:
'''Run qemu-img and return its output'''
--
2.34.1
next prev parent reply other threads:[~2022-03-21 20:28 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-21 20:16 [PATCH v5 00/18] iotests: add enhanced debugging info to qemu-img failures John Snow
2022-03-21 20:16 ` [PATCH v5 01/18] python/utils: add add_visual_margin() text decoration utility John Snow
2022-03-21 20:16 ` [PATCH v5 02/18] python/utils: add VerboseProcessError John Snow
2022-03-21 20:16 ` [PATCH v5 03/18] iotests: Remove explicit checks for qemu_img() == 0 John Snow
2022-03-21 20:16 ` [PATCH v5 04/18] iotests: make qemu_img raise on non-zero rc by default John Snow
2022-03-21 20:16 ` [PATCH v5 05/18] iotests: fortify compare_images() against crashes John Snow
2022-03-21 20:16 ` [PATCH v5 06/18] iotests: add qemu_img_json() John Snow
2022-03-21 20:16 ` John Snow [this message]
2022-03-21 20:16 ` [PATCH v5 08/18] iotests: add qemu_img_info() John Snow
2022-03-21 20:16 ` [PATCH v5 09/18] iotests/remove-bitmap-from-backing: use qemu_img_info() John Snow
2022-03-21 20:16 ` [PATCH v5 10/18] iotests: add qemu_img_map() function John Snow
2022-03-21 20:16 ` [PATCH v5 11/18] iotests: change supports_quorum to use qemu_img John Snow
2022-03-21 20:16 ` [PATCH v5 12/18] iotests: replace unchecked calls to qemu_img_pipe() John Snow
2022-03-21 20:16 ` [PATCH v5 13/18] iotests/149: Remove qemu_img_pipe() call John Snow
2022-03-21 20:16 ` [PATCH v5 14/18] iotests: remove remaining calls to qemu_img_pipe() John Snow
2022-03-21 20:16 ` [PATCH v5 15/18] iotests: use qemu_img() in has_working_luks() John Snow
2022-03-21 20:16 ` [PATCH v5 16/18] iotests: replace qemu_img_log('create', ...) calls John Snow
2022-03-21 20:16 ` [PATCH v5 17/18] iotests: remove qemu_img_pipe_and_status() John Snow
2022-03-21 21:31 ` Eric Blake
2022-03-21 20:16 ` [PATCH v5 18/18] iotests: make qemu_img_log and img_info_log raise on error John Snow
2022-03-21 21:33 ` Eric Blake
2022-03-22 9:42 ` [PATCH v5 00/18] iotests: add enhanced debugging info to qemu-img failures Hanna Reitz
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=20220321201618.903471-8-jsnow@redhat.com \
--to=jsnow@redhat.com \
--cc=bleal@redhat.com \
--cc=crosa@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).