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

iotests: drop qemu_img_verbose() helper 

qemu_img_verbose() has a drawback of not going through generic
qemu_img_pipe_and_status(). qemu_img_verbose() is not very popular, so
update the only two users to qemu_img_log() and drop qemu_img_verbose()
at all.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
Message-Id: <20211223160144.1097696-6-vsementsov@virtuozzo.com>
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2021-12-23 17:01:30 +01:00 committed by Hanna Reitz
parent 22e29bcea1
commit 8f9e54ccfd
5 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/qemu-iotests/044
View File

@ -24,7 +24,7 @@ import os
import qcow2 import qcow2
from qcow2 import QcowHeader from qcow2 import QcowHeader
import iotests import iotests
from iotests import qemu_img, qemu_img_verbose, qemu_io from iotests import qemu_img, qemu_img_log, qemu_io
import struct import struct
import subprocess import subprocess
import sys import sys
@ -112,10 +112,11 @@ class TestRefcountTableGrowth(iotests.QMPTestCase):
def test_grow_refcount_table(self): def test_grow_refcount_table(self):
qemu_io('-c', 'write 3800M 1M', test_img) qemu_io('-c', 'write 3800M 1M', test_img)
qemu_img_verbose('check' , test_img) qemu_img_log('check' , test_img)
pass pass
if __name__ == '__main__': if __name__ == '__main__':
iotests.activate_logging()
iotests.main(supported_fmts=['qcow2'], iotests.main(supported_fmts=['qcow2'],
supported_protocols=['file'], supported_protocols=['file'],
unsupported_imgopts=['refcount_bits']) unsupported_imgopts=['refcount_bits'])

1
tests/qemu-iotests/044.out
View File

@ -1,6 +1,7 @@
No errors were found on the image. No errors were found on the image.
7292415/33554432 = 21.73% allocated, 0.00% fragmented, 0.00% compressed clusters 7292415/33554432 = 21.73% allocated, 0.00% fragmented, 0.00% compressed clusters
Image end offset: 4296217088 Image end offset: 4296217088
. .
---------------------------------------------------------------------- ----------------------------------------------------------------------
Ran 1 tests Ran 1 tests

7
tests/qemu-iotests/209
View File

@ -20,8 +20,8 @@
# #
import iotests import iotests
from iotests import qemu_img_create, qemu_io, qemu_img_verbose, qemu_nbd, \ from iotests import qemu_img_create, qemu_io, qemu_img_log, qemu_nbd, \
file_path file_path, log
iotests.script_initialize(supported_fmts=['qcow2']) iotests.script_initialize(supported_fmts=['qcow2'])
@ -33,4 +33,5 @@ qemu_img_create('-f', iotests.imgfmt, disk, '1M')
qemu_io('-f', iotests.imgfmt, '-c', 'write 0 512K', disk) qemu_io('-f', iotests.imgfmt, '-c', 'write 0 512K', disk)
qemu_nbd('-k', nbd_sock, '-x', 'exp', '-f', iotests.imgfmt, disk) qemu_nbd('-k', nbd_sock, '-x', 'exp', '-f', iotests.imgfmt, disk)
qemu_img_verbose('map', '-f', 'raw', '--output=json', nbd_uri) qemu_img_log('map', '-f', 'raw', '--output=json', nbd_uri)
log('done.') # avoid new line at the end of output file

2
tests/qemu-iotests/209.out
View File

@ -1,2 +1,4 @@
[{ "start": 0, "length": 524288, "depth": 0, "present": true, "zero": false, "data": true, "offset": 0}, [{ "start": 0, "length": 524288, "depth": 0, "present": true, "zero": false, "data": true, "offset": 0},
{ "start": 524288, "length": 524288, "depth": 0, "present": true, "zero": true, "data": false, "offset": 524288}] { "start": 524288, "length": 524288, "depth": 0, "present": true, "zero": true, "data": false, "offset": 524288}]
done.

8
tests/qemu-iotests/iotests.py
View File

@ -235,14 +235,6 @@ def qemu_img_measure(*args):
def qemu_img_check(*args): def qemu_img_check(*args):
return json.loads(qemu_img_pipe("check", "--output", "json", *args)) return json.loads(qemu_img_pipe("check", "--output", "json", *args))
def qemu_img_verbose(*args):
'''Run qemu-img without suppressing its output and return the exit code'''
exitcode = subprocess.call(qemu_img_args + list(args))
if exitcode < 0:
sys.stderr.write('qemu-img received signal %i: %s\n'
% (-exitcode, ' '.join(qemu_img_args + list(args))))
return exitcode
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]