motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-03 15:53:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

iotests: add qemu_img_info()

Browse source 
Add qemu_img_info() by analogy with qemu_img_measure() and
qemu_img_check(). Modify image_size() to use this function instead to
take advantage of the better diagnostic information on failure provided
(ultimately) by qemu_img().

Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
Message-Id: <20220321201618.903471-9-jsnow@redhat.com>
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
This commit is contained in:
John Snow 2022-03-21 16:16:08 -04:00 • committed by Hanna Reitz
parent 0f7d7d72aa
commit 9ebb2b765b
3 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
tests/qemu-iotests/iotests.py
View file

@ -315,6 +315,9 @@ def qemu_img_measure(*args: str) -> Any:
def qemu_img_check(*args: str) -> Any:
return qemu_img_json("check", "--output", "json", *args)
def qemu_img_info(*args: str) -> Any:
return qemu_img_json('info', "--output", "json", *args)
def qemu_img_pipe(*args: str) -> str:
'''Run qemu-img and return its output'''
return qemu_img_pipe_and_status(*args)[0]
@ -565,10 +568,14 @@ def create_image(name, size):
file.write(sector)
i = i + 512
def image_size(img):
'''Return image's virtual size'''
r = qemu_img_pipe('info', '--output=json', '-f', imgfmt, img)
return json.loads(r)['virtual-size']
def image_size(img: str) -> int:
"""Return image's virtual size"""
value = qemu_img_info('-f', imgfmt, img)['virtual-size']
if not isinstance(value, int):
type_name = type(value).__name__
raise TypeError("Expected 'int' for 'virtual-size', "
f"got '{value}' of type '{type_name}'")
return value
def is_str(val):
return isinstance(val, str)