qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
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 v4 06/18] iotests: add qemu_img_json()
Date: Thu, 17 Mar 2022 19:49:25 -0400	[thread overview]
Message-ID: <20220317234937.569525-7-jsnow@redhat.com> (raw)
In-Reply-To: <20220317234937.569525-1-jsnow@redhat.com>

qemu_img_json() is a new helper built on top of qemu_img() that tries to
pull a valid JSON document out of the stdout stream.

In the event that the return code is negative (the program crashed), or
the code is greater than zero and did not produce valid JSON output, the
VerboseProcessError raised by qemu_img() is re-raised.

In the event that the return code is zero but we can't parse valid JSON,
allow the JSON deserialization error to be raised.

Signed-off-by: John Snow <jsnow@redhat.com>
---
 tests/qemu-iotests/iotests.py | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index 7057db0686..9d23066701 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -276,6 +276,38 @@ def ordered_qmp(qmsg, conv_keys=True):
 def qemu_img_create(*args: str) -> subprocess.CompletedProcess[str]:
     return qemu_img('create', *args)
 
+def qemu_img_json(*args: str) -> Any:
+    """
+    Run qemu-img and return its output as deserialized JSON.
+
+    :raise CalledProcessError:
+        When qemu-img crashes, or returns a non-zero exit code without
+        producing a valid JSON document to stdout.
+    :raise JSONDecoderError:
+        When qemu-img returns 0, but failed to produce a valid JSON document.
+
+    :return: A deserialized JSON object; probably a dict[str, Any].
+    """
+    try:
+        res = qemu_img(*args, combine_stdio=False)
+    except subprocess.CalledProcessError as exc:
+        # Terminated due to signal. Don't bother.
+        if exc.returncode < 0:
+            raise
+
+        # Commands like 'check' can return failure (exit codes 2 and 3)
+        # to indicate command completion, but with errors found. For
+        # multi-command flexibility, ignore the exact error codes and
+        # *try* to load JSON.
+        try:
+            return json.loads(exc.stdout)
+        except json.JSONDecodeError:
+            # Nope. This thing is toast. Raise the /process/ error.
+            pass
+        raise
+
+    return json.loads(res.stdout)
+
 def qemu_img_measure(*args):
     return json.loads(qemu_img_pipe("measure", "--output", "json", *args))
 
-- 
2.34.1



  parent reply	other threads:[~2022-03-17 23:58 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-17 23:49 [PATCH v4 00/18] iotests: add enhanced debugging info to qemu-img failures John Snow
2022-03-17 23:49 ` [PATCH v4 01/18] python/utils: add add_visual_margin() text decoration utility John Snow
2022-03-17 23:49 ` [PATCH v4 02/18] python/utils: add VerboseProcessError John Snow
2022-03-17 23:49 ` [PATCH v4 03/18] iotests: Remove explicit checks for qemu_img() == 0 John Snow
2022-03-17 23:49 ` [PATCH v4 04/18] iotests: make qemu_img raise on non-zero rc by default John Snow
2022-03-17 23:49 ` [PATCH v4 05/18] iotests: fortify compare_images() against crashes John Snow
2022-03-17 23:49 ` John Snow [this message]
2022-03-21 13:40   ` [PATCH v4 06/18] iotests: add qemu_img_json() Eric Blake
2022-03-17 23:49 ` [PATCH v4 07/18] iotests: use qemu_img_json() when applicable John Snow
2022-03-17 23:49 ` [PATCH v4 08/18] iotests: add qemu_img_info() John Snow
2022-03-17 23:49 ` [PATCH v4 09/18] iotests/remove-bitmap-from-backing: use qemu_img_info() John Snow
2022-03-17 23:49 ` [PATCH v4 10/18] iotests: add qemu_img_map() function John Snow
2022-03-21 14:24   ` Eric Blake
2022-03-21 16:15     ` John Snow
2022-03-17 23:49 ` [PATCH v4 11/18] iotests: change supports_quorum to use qemu_img John Snow
2022-03-17 23:49 ` [PATCH v4 12/18] iotests: replace unchecked calls to qemu_img_pipe() John Snow
2022-03-17 23:49 ` [PATCH v4 13/18] iotests/149: Remove qemu_img_pipe() call John Snow
2022-03-17 23:49 ` [PATCH v4 14/18] iotests: remove remaining calls to qemu_img_pipe() John Snow
2022-03-17 23:49 ` [PATCH v4 15/18] iotests: use qemu_img() in has_working_luks() John Snow
2022-03-17 23:49 ` [PATCH v4 16/18] iotests: replace qemu_img_log('create', ...) calls John Snow
2022-03-17 23:49 ` [PATCH v4 17/18] iotests: remove qemu_img_pipe_and_status() John Snow
2022-03-17 23:49 ` [PATCH v4 18/18] iotests: make qemu_img_log and img_info_log raise on error John Snow
2022-03-18 13:35 ` [PATCH v4 00/18] iotests: add enhanced debugging info to qemu-img failures Hanna Reitz
2022-03-18 15:08   ` John Snow
2022-03-18 16:38     ` Hanna Reitz
2022-03-18 21:14   ` John Snow
2022-03-21 13:14     ` Hanna Reitz
2022-03-21 15:50       ` Hanna Reitz
2022-03-21 16:23         ` John Snow
2022-03-21 16:26           ` 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=20220317234937.569525-7-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).