On 17.06.20 14:52, Kevin Wolf wrote: > Am 17.06.2020 um 12:48 hat Max Reitz geschrieben: >> Hi, >> >> Thomas’s report >> (https://lists.nongnu.org/archive/html/qemu-block/2020-06/msg00791.html) >> has given me a nice excuse to write this series. >> >> There are some iotests that have recently start to fail in rarely >> exercised test environments (qed, qcow2 with data_file, qcow2 v2), and >> this series fixes what I found. > > Thanks, applied to the block branch.
Sorry, I didn’t run iotest 297 before sending this series... The problems arise in patch 1: iotests.py:1113:0: C0301: Line too long (80/79) (line-too-long) iotests.py:1106: error: Function is missing a return type annotation (So there’s a line with 80 characters, when 79 is the maximum (*shrug*), and I failed to specify skip_for_format’s return type.) I think patch 1 needs the attached diff squashed in. Are you willing to do that or should I just send a v2? Max
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index 92c08b9dc6..5ea4c4df8b 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -1103,14 +1103,17 @@ def skip_if_unsupported(required_formats=(), read_only=False):
return func_wrapper
return skip_test_decorator
-def skip_for_formats(formats: Sequence[str] = ()):
+def skip_for_formats(formats: Sequence[str] = ()) \
+ -> Callable[[Callable[[QMPTestCase, List[Any], Dict[str, Any]], None]],
+ Callable[[QMPTestCase, List[Any], Dict[str, Any]], None]]:
'''Skip Test Decorator
Skips the test for the given formats'''
def skip_test_decorator(func):
def func_wrapper(test_case: QMPTestCase, *args: List[Any],
**kwargs: Dict[str, Any]) -> None:
if imgfmt in formats:
- test_case.case_skip(f'{test_case}: Skipped for format {imgfmt}')
+ msg = f'{test_case}: Skipped for format {imgfmt}'
+ test_case.case_skip(msg)
else:
func(test_case, *args, **kwargs)
return func_wrapper
signature.asc
Description: OpenPGP digital signature
