[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 07/18] iotests: use qemu_img_json() when applicable
From: |
John Snow |
Subject: |
[PATCH v5 07/18] iotests: use qemu_img_json() when applicable |
Date: |
Mon, 21 Mar 2022 16:16:07 -0400 |
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
- [PATCH v5 00/18] iotests: add enhanced debugging info to qemu-img failures, John Snow, 2022/03/21
- [PATCH v5 01/18] python/utils: add add_visual_margin() text decoration utility, John Snow, 2022/03/21
- [PATCH v5 03/18] iotests: Remove explicit checks for qemu_img() == 0, John Snow, 2022/03/21
- [PATCH v5 02/18] python/utils: add VerboseProcessError, John Snow, 2022/03/21
- [PATCH v5 04/18] iotests: make qemu_img raise on non-zero rc by default, John Snow, 2022/03/21
- [PATCH v5 05/18] iotests: fortify compare_images() against crashes, John Snow, 2022/03/21
- [PATCH v5 06/18] iotests: add qemu_img_json(), John Snow, 2022/03/21
- [PATCH v5 07/18] iotests: use qemu_img_json() when applicable,
John Snow <=
- [PATCH v5 08/18] iotests: add qemu_img_info(), John Snow, 2022/03/21
- [PATCH v5 09/18] iotests/remove-bitmap-from-backing: use qemu_img_info(), John Snow, 2022/03/21
- [PATCH v5 15/18] iotests: use qemu_img() in has_working_luks(), John Snow, 2022/03/21
- [PATCH v5 11/18] iotests: change supports_quorum to use qemu_img, John Snow, 2022/03/21
- [PATCH v5 17/18] iotests: remove qemu_img_pipe_and_status(), John Snow, 2022/03/21
- [PATCH v5 13/18] iotests/149: Remove qemu_img_pipe() call, John Snow, 2022/03/21
- [PATCH v5 14/18] iotests: remove remaining calls to qemu_img_pipe(), John Snow, 2022/03/21
- [PATCH v5 16/18] iotests: replace qemu_img_log('create', ...) calls, John Snow, 2022/03/21
- [PATCH v5 12/18] iotests: replace unchecked calls to qemu_img_pipe(), John Snow, 2022/03/21