All of lore.kernel.org
 help / color / mirror / Atom feed
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 01/14] iotests: add qemu_img_json()
Date: Tue,  8 Mar 2022 22:53:54 -0500	[thread overview]
Message-ID: <20220309035407.1848654-2-jsnow@redhat.com> (raw)
In-Reply-To: <20220309035407.1848654-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 | 38 +++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index 7057db0686..546b142a6c 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -276,6 +276,44 @@ 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].
+    """
+    json_data = ...  # json.loads can legitimately return 'None'.
+
+    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:
+            json_data = json.loads(exc.stdout)
+        except json.JSONDecodeError:
+            # Nope. This thing is toast. Raise the process error.
+            pass
+
+        if json_data is ...:
+            raise
+
+    if json_data is ...:
+        json_data = json.loads(res.stdout)
+    return json_data
+
 def qemu_img_measure(*args):
     return json.loads(qemu_img_pipe("measure", "--output", "json", *args))
 
-- 
2.34.1



  reply	other threads:[~2022-03-09  3:55 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 ` John Snow [this message]
2022-03-17 10:53   ` [PATCH 01/14] iotests: add qemu_img_json() 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 ` [PATCH 06/14] iotests: change supports_quorum to use qemu_img John Snow
2022-03-17 11:35   ` 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-2-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 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.