[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 06/18] iotests: add qemu_img_json()
From: |
John Snow |
Subject: |
[PATCH v2 06/18] iotests: add qemu_img_json() |
Date: |
Mon, 21 Feb 2022 17:34:01 -0500 |
A little 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 instead.
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 | 35 +++++++++++++++++++++++++++++++++++
1 file changed, 35 insertions(+)
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index 24765de2e27..1e6947b893b 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -309,6 +309,41 @@ 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.
+ """
+ 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:
+ pass # Nope. This thing is toast.
+
+ 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
- [PATCH v2 00/18] iotests: add detailed tracebacks to qemu_img() failures, John Snow, 2022/02/21
- [PATCH v2 02/18] iotests: add VerboseProcessError, John Snow, 2022/02/21
- [PATCH v2 03/18] iotests: Remove explicit checks for qemu_img() == 0, John Snow, 2022/02/21
- [PATCH v2 01/18] python/utils: add enboxify() text decoration utility, John Snow, 2022/02/21
- [PATCH v2 05/18] iotests: fortify compare_images() against crashes, John Snow, 2022/02/21
- [PATCH v2 06/18] iotests: add qemu_img_json(),
John Snow <=
- [PATCH v2 04/18] iotests: make qemu_img raise on non-zero rc by default, John Snow, 2022/02/21
- [PATCH v2 08/18] iotests: add qemu_img_info(), John Snow, 2022/02/21
- [PATCH v2 07/18] iotests: use qemu_img_json() when applicable, John Snow, 2022/02/21
- [PATCH v2 09/18] iotests: remove-bitmap-from-backing: use qemu_img_info(), John Snow, 2022/02/21
- [PATCH v2 10/18] iotests: add qemu_img_map() function, John Snow, 2022/02/21
- [PATCH v2 11/18] iotests: change supports_quorum to use qemu_img, John Snow, 2022/02/21
- [PATCH v2 13/18] iotests: remove external calls to qemu_img_pipe(), John Snow, 2022/02/21
- [PATCH v2 12/18] iotests: replace unchecked calls to qemu_img_pipe(), John Snow, 2022/02/21
- [PATCH v2 14/18] iotests: move has_working_luks onto qemu_img(), John Snow, 2022/02/21
- [PATCH v2 16/18] iotests: remove qemu_img_pipe(), John Snow, 2022/02/21