aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Snow <jsnow@redhat.com>2022-03-21 16:16:07 -0400
committerHanna Reitz <hreitz@redhat.com>2022-03-22 10:14:29 +0100
commit0f7d7d72aa99c8e48bbbf37262a9c66c83113f76 (patch)
treef6d9b712d25bf6b61481f6b4f3b3472312b369e6
parent29768d04afe5c87272e8fb7de1290f7a4f530785 (diff)
downloadqemu-0f7d7d72aa99c8e48bbbf37262a9c66c83113f76.zip
qemu-0f7d7d72aa99c8e48bbbf37262a9c66c83113f76.tar.gz
qemu-0f7d7d72aa99c8e48bbbf37262a9c66c83113f76.tar.bz2
iotests: use qemu_img_json() when applicable
qemu_img_json() gives better diagnostic information on failure. Signed-off-by: John Snow <jsnow@redhat.com> Reviewed-by: Hanna Reitz <hreitz@redhat.com> Message-Id: <20220321201618.903471-8-jsnow@redhat.com> Signed-off-by: Hanna Reitz <hreitz@redhat.com>
-rw-r--r--tests/qemu-iotests/iotests.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index 56aa068..4725313 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'''