ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

iotests: add qemu_img_info() 

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/qemu-iotests/065
View File

@ -24,7 +24,7 @@ import os
import re import re
import json import json
import iotests import iotests
from iotests import qemu_img, qemu_img_pipe from iotests import qemu_img, qemu_img_info, qemu_img_pipe
import unittest import unittest
test_img = os.path.join(iotests.test_dir, 'test.img') test_img = os.path.join(iotests.test_dir, 'test.img')
@ -49,8 +49,7 @@ class TestQemuImgInfo(TestImageInfoSpecific):
human_compare = None human_compare = None
def test_json(self): def test_json(self):
data = json.loads(qemu_img_pipe('info', '--output=json', test_img)) data = qemu_img_info(test_img)['format-specific']
data = data['format-specific']
self.assertEqual(data['type'], iotests.imgfmt) self.assertEqual(data['type'], iotests.imgfmt)
self.assertEqual(data['data'], self.json_compare) self.assertEqual(data['data'], self.json_compare)

5
tests/qemu-iotests/242
View File

@ -22,7 +22,7 @@
import iotests import iotests
import json import json
import struct import struct
from iotests import qemu_img_create, qemu_io, qemu_img_pipe, \ from iotests import qemu_img_create, qemu_io, qemu_img_info, \
file_path, img_info_log, log, filter_qemu_io file_path, img_info_log, log, filter_qemu_io
iotests.script_initialize(supported_fmts=['qcow2'], iotests.script_initialize(supported_fmts=['qcow2'],
@ -39,8 +39,7 @@ flag_offset = 0x5000f
def print_bitmap(extra_args): def print_bitmap(extra_args):
log('qemu-img info dump:\n') log('qemu-img info dump:\n')
img_info_log(disk, extra_args=extra_args) img_info_log(disk, extra_args=extra_args)
result = json.loads(qemu_img_pipe('info', '--force-share', result = qemu_img_info('--force-share', disk)
'--output=json', disk))
if 'bitmaps' in result['format-specific']['data']: if 'bitmaps' in result['format-specific']['data']:
bitmaps = result['format-specific']['data']['bitmaps'] bitmaps = result['format-specific']['data']['bitmaps']
log('The same bitmaps in JSON format:') log('The same bitmaps in JSON format:')

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: def qemu_img_check(*args: str) -> Any:
return qemu_img_json("check", "--output", "json", *args) 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: def qemu_img_pipe(*args: str) -> str:
'''Run qemu-img and return its output''' '''Run qemu-img and return its output'''
return qemu_img_pipe_and_status(*args)[0] return qemu_img_pipe_and_status(*args)[0]
@ -565,10 +568,14 @@ def create_image(name, size):
file.write(sector) file.write(sector)
i = i + 512 i = i + 512
def image_size(img): def image_size(img: str) -> int:
'''Return image's virtual size''' """Return image's virtual size"""
r = qemu_img_pipe('info', '--output=json', '-f', imgfmt, img) value = qemu_img_info('-f', imgfmt, img)['virtual-size']
return json.loads(r)['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): def is_str(val):
return isinstance(val, str) return isinstance(val, str)