On 17/09/2019 12:20, Max Reitz wrote: > This lets tests use skip_if_unsupported() with a potentially variable > list of required formats. > > Suggested-by: Kevin Wolf <[email protected]> > Signed-off-by: Max Reitz <[email protected]> > --- > tests/qemu-iotests/iotests.py | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py > index 427c34697a..a42702b6b9 100644 > --- a/tests/qemu-iotests/iotests.py > +++ b/tests/qemu-iotests/iotests.py > @@ -894,8 +894,12 @@ def skip_if_unsupported(required_formats=[], > read_only=False): > Runs the test if all the required formats are whitelisted''' > def skip_test_decorator(func): > def func_wrapper(test_case: QMPTestCase, *args, **kwargs): > - usf_list = list(set(required_formats) - > - set(supported_formats(read_only))) > + if callable(required_formats): > + fmts = required_formats(test_case) > + else: > + fmts = required_formats > + > + usf_list = list(set(fmts) - set(supported_formats(read_only))) > if usf_list: > test_case.case_skip('{}: formats {} are not > whitelisted'.format( > test_case, usf_list)) >
Reviewed-by: Andrey Shinkevich <[email protected]> -- With the best regards, Andrey Shinkevich
