Skip to content

Commit

Permalink
iotests: use qemu_img_json() when applicable
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
jnsnow authored and XanClic committed Mar 22, 2022
1 parent 29768d0 commit 0f7d7d7
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions tests/qemu-iotests/iotests.py
Expand Up @@ -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'''
Expand Down

0 comments on commit 0f7d7d7

Please sign in to comment.