[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 02/14] iotests: use qemu_img_json() when applicable
From: |
John Snow |
Subject: |
[PATCH 02/14] iotests: use qemu_img_json() when applicable |
Date: |
Tue, 8 Mar 2022 22:53:55 -0500 |
qemu_img_json() gives better diagnostic information on failure.
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 546b142a6c..7b37938d45 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -314,11 +314,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
[PATCH 06/14] iotests: change supports_quorum to use qemu_img, John Snow, 2022/03/08