On 8/21/19 1:52 AM, John Snow wrote:
> This will add supported_protocols and unsupported_protocols to all of
> iotests.main, iotests.script_main, and iotests.script_initialize.
With your Signed-off-by:
Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com>
> ---
> tests/qemu-iotests/207 | 4 ++--
> tests/qemu-iotests/210 | 4 ++--
> tests/qemu-iotests/211 | 4 ++--
> tests/qemu-iotests/212 | 4 ++--
> tests/qemu-iotests/213 | 4 ++--
> tests/qemu-iotests/iotests.py | 5 ++++-
> 6 files changed, 14 insertions(+), 11 deletions(-)
>
> diff --git a/tests/qemu-iotests/207 b/tests/qemu-iotests/207
> index ab9e3b6747..35d98f2736 100755
> --- a/tests/qemu-iotests/207
> +++ b/tests/qemu-iotests/207
> @@ -24,8 +24,8 @@ import iotests
> import subprocess
> import re
>
> -iotests.script_initialize(supported_fmts=['raw'])
> -iotests.verify_protocol(supported=['ssh'])
> +iotests.script_initialize(supported_fmts=['raw'],
> + supported_protocols=['ssh'])
>
> def filter_hash(qmsg):
> def _filter(key, value):
> diff --git a/tests/qemu-iotests/210 b/tests/qemu-iotests/210
> index 5a7013cd34..d9fe780c07 100755
> --- a/tests/qemu-iotests/210
> +++ b/tests/qemu-iotests/210
> @@ -23,8 +23,8 @@
> import iotests
> from iotests import imgfmt
>
> -iotests.script_initialize(supported_fmts=['luks'])
> -iotests.verify_protocol(supported=['file'])
> +iotests.script_initialize(supported_fmts=['luks'],
> + supported_protocols=['file'])
>
> def blockdev_create(vm, options):
> result = vm.qmp_log('blockdev-create', job_id='job0', options=options,
> diff --git a/tests/qemu-iotests/211 b/tests/qemu-iotests/211
> index 4d6aac497f..155fac4e87 100755
> --- a/tests/qemu-iotests/211
> +++ b/tests/qemu-iotests/211
> @@ -23,8 +23,8 @@
> import iotests
> from iotests import imgfmt
>
> -iotests.script_initialize(supported_fmts=['vdi'])
> -iotests.verify_protocol(supported=['file'])
> +iotests.script_initialize(supported_fmts=['vdi'],
> + supported_protocols=['file'])
>
> def blockdev_create(vm, options):
> result = vm.qmp_log('blockdev-create', job_id='job0', options=options,
> diff --git a/tests/qemu-iotests/212 b/tests/qemu-iotests/212
> index ec35bceb11..67e5a1dbb5 100755
> --- a/tests/qemu-iotests/212
> +++ b/tests/qemu-iotests/212
> @@ -23,8 +23,8 @@
> import iotests
> from iotests import imgfmt
>
> -iotests.script_initialize(supported_fmts=['parallels'])
> -iotests.verify_protocol(supported=['file'])
> +iotests.script_initialize(supported_fmts=['parallels'],
> + supported_protocols=['file'])
>
> def blockdev_create(vm, options):
> result = vm.qmp_log('blockdev-create', job_id='job0', options=options,
> diff --git a/tests/qemu-iotests/213 b/tests/qemu-iotests/213
> index 3d2c024375..23f387ab63 100755
> --- a/tests/qemu-iotests/213
> +++ b/tests/qemu-iotests/213
> @@ -23,8 +23,8 @@
> import iotests
> from iotests import imgfmt
>
> -iotests.script_initialize(supported_fmts=['vhdx'])
> -iotests.verify_protocol(supported=['file'])
> +iotests.script_initialize(supported_fmts=['vhdx'],
> + supported_protocols=['file'])
>
> def blockdev_create(vm, options):
> result = vm.qmp_log('blockdev-create', job_id='job0', options=options,
> diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
> index 2970d7304a..661d7f93bf 100644
> --- a/tests/qemu-iotests/iotests.py
> +++ b/tests/qemu-iotests/iotests.py
> @@ -925,7 +925,9 @@ def execute_unittest(debug=False):
> def execute_setup_common(supported_fmts=[],
> supported_oses=['linux'],
> supported_cache_modes=[],
> - unsupported_fmts=[]):
> + unsupported_fmts=[],
> + supported_protocols=[],
> + unsupported_protocols=[]):
> """
> Perform necessary setup for either script-style or unittest-style tests.
> """
> @@ -941,6 +943,7 @@ def execute_setup_common(supported_fmts=[],
> verify_image_format(supported_fmts, unsupported_fmts)
> verify_platform(supported_oses)
> verify_cache_mode(supported_cache_modes)
> + verify_protocol(supported_protocols, unsupported_protocols)
>
> debug = '-d' in sys.argv
> if debug:
>
