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

iotests: qemu_io_silent: support --image-opts 

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20201021145859.11201-11-vsementsov@virtuozzo.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2020-10-21 17:58:48 +03:00 committed by Max Reitz
parent 42ba0225bd
commit 5b66a8fc20
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -205,7 +205,12 @@ def qemu_io_log(*args):
def qemu_io_silent(*args): def qemu_io_silent(*args):
'''Run qemu-io and return the exit code, suppressing stdout''' '''Run qemu-io and return the exit code, suppressing stdout'''
args = qemu_io_args + list(args) if '-f' in args or '--image-opts' in args:
default_args = qemu_io_args_no_fmt
else:
default_args = qemu_io_args
args = default_args + list(args)
exitcode = subprocess.call(args, stdout=open('/dev/null', 'w')) exitcode = subprocess.call(args, stdout=open('/dev/null', 'w'))
if exitcode < 0: if exitcode < 0:
sys.stderr.write('qemu-io received signal %i: %s\n' % sys.stderr.write('qemu-io received signal %i: %s\n' %