All of lore.kernel.org
 help / color / mirror / Atom feed
From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org
Cc: Eduardo Habkost <eduardo@habkost.net>,
	Kevin Wolf <kwolf@redhat.com>, Thomas Huth <thuth@redhat.com>,
	Beraldo Leal <bleal@redhat.com>,
	qemu-block@nongnu.org, Eric Blake <eblake@redhat.com>,
	Hanna Reitz <hreitz@redhat.com>, Cleber Rosa <crosa@redhat.com>,
	John Snow <jsnow@redhat.com>
Subject: [PATCH v2 07/18] iotests: use qemu_img_json() when applicable
Date: Mon, 21 Feb 2022 17:34:02 -0500	[thread overview]
Message-ID: <20220221223413.2123003-8-jsnow@redhat.com> (raw)
In-Reply-To: <20220221223413.2123003-1-jsnow@redhat.com>

These functions should now give better crash information when something
unexpected happens.

Signed-off-by: John Snow <jsnow@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 1e6947b893b..fc0d054e129 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -344,11 +344,11 @@ def qemu_img_json(*args: str) -> Any:
         json_data = json.loads(res.stdout)
     return json_data
 
-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



  parent reply	other threads:[~2022-02-21 22:43 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-21 22:33 [PATCH v2 00/18] iotests: add detailed tracebacks to qemu_img() failures John Snow
2022-02-21 22:33 ` [PATCH v2 01/18] python/utils: add enboxify() text decoration utility John Snow
2022-02-21 22:33 ` [PATCH v2 02/18] iotests: add VerboseProcessError John Snow
2022-02-21 22:33 ` [PATCH v2 03/18] iotests: Remove explicit checks for qemu_img() == 0 John Snow
2022-02-21 22:33 ` [PATCH v2 04/18] iotests: make qemu_img raise on non-zero rc by default John Snow
2022-02-21 22:34 ` [PATCH v2 05/18] iotests: fortify compare_images() against crashes John Snow
2022-02-21 22:34 ` [PATCH v2 06/18] iotests: add qemu_img_json() John Snow
2022-02-21 22:34 ` John Snow [this message]
2022-02-21 22:34 ` [PATCH v2 08/18] iotests: add qemu_img_info() John Snow
2022-02-21 22:34 ` [PATCH v2 09/18] iotests: remove-bitmap-from-backing: use qemu_img_info() John Snow
2022-02-21 22:34 ` [PATCH v2 10/18] iotests: add qemu_img_map() function John Snow
2022-02-21 22:34 ` [PATCH v2 11/18] iotests: change supports_quorum to use qemu_img John Snow
2022-02-21 22:34 ` [PATCH v2 12/18] iotests: replace unchecked calls to qemu_img_pipe() John Snow
2022-02-21 22:34 ` [PATCH v2 13/18] iotests: remove external " John Snow
2022-02-21 22:34 ` [PATCH v2 14/18] iotests: move has_working_luks onto qemu_img() John Snow
2022-02-21 22:34 ` [PATCH v2 15/18] iotests: remove qemu_img_log('create', ...) calls John Snow
2022-02-21 22:34 ` [PATCH v2 16/18] iotests: remove qemu_img_pipe() John Snow
2022-02-21 22:34 ` [PATCH v2 17/18] iotests: make qemu_img_log() check log level John Snow
2022-02-21 22:34 ` [PATCH v2 18/18] iotests: reimplement img_info_log in terms of qemu_img_log 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=20220221223413.2123003-8-jsnow@redhat.com \
    --to=jsnow@redhat.com \
    --cc=bleal@redhat.com \
    --cc=crosa@redhat.com \
    --cc=eblake@redhat.com \
    --cc=eduardo@habkost.net \
    --cc=hreitz@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=thuth@redhat.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.