Re: [Qemu-devel] [PATCH 1/9] iotests: Re-add filename filters

[John Snow]

On 1/23/19 9:46 AM, Max Reitz wrote:
> A previous commit removed the default filters for qmp_log with the
> intention to make them explicit; but this happened only for test 206.
> There are more tests (for more exotic image formats than qcow2) which
> require the filename filter, though.
> 
> Fixes: f8ca8609d8549def45b28e82ecac64adaeee9f12
> Signed-off-by: Max Reitz <address@hidden>

Apologies, I need to be better about remembering to run the weird
formats when it's not rc0 time.

Reviewed-by: John Snow <address@hidden>

> ---
>  tests/qemu-iotests/210 | 5 +++--
>  tests/qemu-iotests/211 | 5 +++--
>  tests/qemu-iotests/212 | 5 +++--
>  tests/qemu-iotests/213 | 5 +++--
>  tests/qemu-iotests/237 | 5 +++--
>  5 files changed, 15 insertions(+), 10 deletions(-)
> 
> diff --git a/tests/qemu-iotests/210 b/tests/qemu-iotests/210
> index d142841e2b..565e3b7b9b 100755
> --- a/tests/qemu-iotests/210
> +++ b/tests/qemu-iotests/210
> @@ -27,7 +27,8 @@ iotests.verify_image_format(supported_fmts=['luks'])
>  iotests.verify_protocol(supported=['file'])
>  
>  def blockdev_create(vm, options):
> -    result = vm.qmp_log('blockdev-create', job_id='job0', options=options)
> +    result = vm.qmp_log('blockdev-create', job_id='job0', options=options,
> +                        filters=[iotests.filter_qmp_testfiles])
>  
>      if 'return' in result:
>          assert result['return'] == {}
> @@ -53,7 +54,7 @@ with iotests.FilePath('t.luks') as disk_path, \
>                            'size': 0 })
>  
>      vm.qmp_log('blockdev-add', driver='file', filename=disk_path,
> -               node_name='imgfile')
> +               node_name='imgfile', filters=[iotests.filter_qmp_testfiles])
>  
>      blockdev_create(vm, { 'driver': imgfmt,
>                            'file': 'imgfile',
> diff --git a/tests/qemu-iotests/211 b/tests/qemu-iotests/211
> index 7b7985db6c..5d285450b5 100755
> --- a/tests/qemu-iotests/211
> +++ b/tests/qemu-iotests/211
> @@ -27,7 +27,8 @@ iotests.verify_image_format(supported_fmts=['vdi'])
>  iotests.verify_protocol(supported=['file'])
>  
>  def blockdev_create(vm, options):
> -    result = vm.qmp_log('blockdev-create', job_id='job0', options=options)
> +    result = vm.qmp_log('blockdev-create', job_id='job0', options=options,
> +                        filters=[iotests.filter_qmp_testfiles])
>  
>      if 'return' in result:
>          assert result['return'] == {}
> @@ -51,7 +52,7 @@ with iotests.FilePath('t.vdi') as disk_path, \
>                            'size': 0 })
>  
>      vm.qmp_log('blockdev-add', driver='file', filename=disk_path,
> -               node_name='imgfile')
> +               node_name='imgfile', filters=[iotests.filter_qmp_testfiles])
>  
>      blockdev_create(vm, { 'driver': imgfmt,
>                            'file': 'imgfile',
> diff --git a/tests/qemu-iotests/212 b/tests/qemu-iotests/212
> index 95c8810d83..42b74f208b 100755
> --- a/tests/qemu-iotests/212
> +++ b/tests/qemu-iotests/212
> @@ -27,7 +27,8 @@ iotests.verify_image_format(supported_fmts=['parallels'])
>  iotests.verify_protocol(supported=['file'])
>  
>  def blockdev_create(vm, options):
> -    result = vm.qmp_log('blockdev-create', job_id='job0', options=options)
> +    result = vm.qmp_log('blockdev-create', job_id='job0', options=options,
> +                        filters=[iotests.filter_qmp_testfiles])
>  
>      if 'return' in result:
>          assert result['return'] == {}
> @@ -51,7 +52,7 @@ with iotests.FilePath('t.parallels') as disk_path, \
>                            'size': 0 })
>  
>      vm.qmp_log('blockdev-add', driver='file', filename=disk_path,
> -               node_name='imgfile')
> +               node_name='imgfile', filters=[iotests.filter_qmp_testfiles])
>  
>      blockdev_create(vm, { 'driver': imgfmt,
>                            'file': 'imgfile',
> diff --git a/tests/qemu-iotests/213 b/tests/qemu-iotests/213
> index 4054439e3c..5604f3cebb 100755
> --- a/tests/qemu-iotests/213
> +++ b/tests/qemu-iotests/213
> @@ -27,7 +27,8 @@ iotests.verify_image_format(supported_fmts=['vhdx'])
>  iotests.verify_protocol(supported=['file'])
>  
>  def blockdev_create(vm, options):
> -    result = vm.qmp_log('blockdev-create', job_id='job0', options=options)
> +    result = vm.qmp_log('blockdev-create', job_id='job0', options=options,
> +                        filters=[iotests.filter_qmp_testfiles])
>  
>      if 'return' in result:
>          assert result['return'] == {}
> @@ -51,7 +52,7 @@ with iotests.FilePath('t.vhdx') as disk_path, \
>                            'size': 0 })
>  
>      vm.qmp_log('blockdev-add', driver='file', filename=disk_path,
> -               node_name='imgfile')
> +               node_name='imgfile', filters=[iotests.filter_qmp_testfiles])
>  
>      blockdev_create(vm, { 'driver': imgfmt,
>                            'file': 'imgfile',
> diff --git a/tests/qemu-iotests/237 b/tests/qemu-iotests/237
> index 251771d7fb..fe0dd0f461 100755
> --- a/tests/qemu-iotests/237
> +++ b/tests/qemu-iotests/237
> @@ -27,7 +27,8 @@ from iotests import imgfmt
>  iotests.verify_image_format(supported_fmts=['vmdk'])
>  
>  def blockdev_create(vm, options):
> -    result = vm.qmp_log('blockdev-create', job_id='job0', options=options)
> +    result = vm.qmp_log('blockdev-create', job_id='job0', options=options,
> +                        filters=[iotests.filter_qmp_testfiles])
>  
>      if 'return' in result:
>          assert result['return'] == {}
> @@ -54,7 +55,7 @@ with iotests.FilePath('t.vmdk') as disk_path, \
>                            'size': 0 })
>  
>      vm.qmp_log('blockdev-add', driver='file', filename=disk_path,
> -               node_name='imgfile')
> +               node_name='imgfile', filters=[iotests.filter_qmp_testfiles])
>  
>      blockdev_create(vm, { 'driver': imgfmt,
>                            'file': 'imgfile',
> 

-- 
—js