On 27.02.20 01:06, John Snow wrote:
> Like script_main, but doesn't require a single point of entry.
> Replace all existing initialization sections with this drop-in replacement.
> 
> This brings debug support to all existing script-style iotests.
> 
> Signed-off-by: John Snow <jsnow@redhat.com>
> ---
>  tests/qemu-iotests/149        |  3 +-
>  tests/qemu-iotests/194        |  4 +-
>  tests/qemu-iotests/202        |  4 +-
>  tests/qemu-iotests/203        |  4 +-
>  tests/qemu-iotests/206        |  2 +-
>  tests/qemu-iotests/207        |  6 ++-
>  tests/qemu-iotests/208        |  2 +-
>  tests/qemu-iotests/209        |  2 +-
>  tests/qemu-iotests/210        |  6 ++-
>  tests/qemu-iotests/211        |  6 ++-
>  tests/qemu-iotests/212        |  6 ++-
>  tests/qemu-iotests/213        |  6 ++-
>  tests/qemu-iotests/216        |  4 +-
>  tests/qemu-iotests/218        |  2 +-
>  tests/qemu-iotests/219        |  2 +-
>  tests/qemu-iotests/222        |  7 ++--
>  tests/qemu-iotests/224        |  4 +-
>  tests/qemu-iotests/228        |  6 ++-
>  tests/qemu-iotests/234        |  4 +-
>  tests/qemu-iotests/235        |  4 +-
>  tests/qemu-iotests/236        |  2 +-
>  tests/qemu-iotests/237        |  2 +-
>  tests/qemu-iotests/238        |  2 +
>  tests/qemu-iotests/242        |  2 +-
>  tests/qemu-iotests/246        |  2 +-
>  tests/qemu-iotests/248        |  2 +-
>  tests/qemu-iotests/254        |  2 +-
>  tests/qemu-iotests/255        |  2 +-
>  tests/qemu-iotests/256        |  2 +-
>  tests/qemu-iotests/258        |  7 ++--
>  tests/qemu-iotests/260        |  4 +-
>  tests/qemu-iotests/262        |  4 +-
>  tests/qemu-iotests/264        |  4 +-
>  tests/qemu-iotests/277        |  2 +
>  tests/qemu-iotests/280        |  8 ++--
>  tests/qemu-iotests/283        |  4 +-
>  tests/qemu-iotests/iotests.py | 73 +++++++++++++++++++++++------------
>  37 files changed, 128 insertions(+), 80 deletions(-)

Reviewed-by: Max Reitz <mreitz@redhat.com>

[...]

> diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
> index e8a0ea14fc..fdcf8a940c 100644
> --- a/tests/qemu-iotests/iotests.py
> +++ b/tests/qemu-iotests/iotests.py

[...]

> @@ -1092,13 +1105,18 @@ def execute_unittest(output, verbosity, debug):
>  
>              sys.stderr.write(out)
>  
> -def execute_test(test_function=None,
> -                 supported_fmts=[],
> -                 supported_platforms=None,
> -                 supported_cache_modes=[], supported_aio_modes={},
> -                 unsupported_fmts=[], supported_protocols=[],
> -                 unsupported_protocols=[]):
> -    """Run either unittest or script-style tests."""
> +def execute_setup_common(supported_fmts: Collection[str] = (),

First time I see something like this, but I suppose it means any
collection (i.e. list or tuple in this case) that has str values?

Max

> +                         supported_platforms: Collection[str] = (),
> +                         supported_cache_modes: Collection[str] = (),
> +                         supported_aio_modes: Collection[str] = (),
> +                         unsupported_fmts: Collection[str] = (),
> +                         supported_protocols: Collection[str] = (),
> +                         unsupported_protocols: Collection[str] = ()) -> bool: