haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

iotests: Use case_skip() in skip_if_unsupported()

Browse source 
skip_if_unsupported() should use the stronger variant case_skip(),
because this allows it to be used even with setUp() (in a meaningful
way).

In the process, make it explicit what we expect the first argument of
the func_wrapper to be (namely something derived of QMPTestCase).

Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-id: 20190917092004.999-4-mreitz@redhat.com
Reviewed-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
Max Reitz 2019-09-17 11:20:00 +02:00
parent 6be0122520
commit e6067a950c
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -929,14 +929,14 @@ def skip_if_unsupported(required_formats=[], read_only=False):
'''Skip Test Decorator
Runs the test if all the required formats are whitelisted'''
def skip_test_decorator(func):
def func_wrapper(*args, **kwargs):
def func_wrapper(test_case: QMPTestCase, *args, **kwargs):
usf_list = list(set(required_formats) -
set(supported_formats(read_only)))
if usf_list:
case_notrun('{}: formats {} are not whitelisted'.format(
args[0], usf_list))
test_case.case_skip('{}: formats {} are not whitelisted'.format(
test_case, usf_list))
else:
return func(*args, **kwargs)
return func(test_case, *args, **kwargs)
return func_wrapper
return skip_test_decorator