From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:48487) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmJnc-00089z-UH for qemu-devel@nongnu.org; Wed, 23 Jan 2019 09:46:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmJnb-0000BY-9f for qemu-devel@nongnu.org; Wed, 23 Jan 2019 09:46:40 -0500 From: Max Reitz Date: Wed, 23 Jan 2019 15:46:02 +0100 Message-Id: <20190123144610.8842-2-mreitz@redhat.com> In-Reply-To: <20190123144610.8842-1-mreitz@redhat.com> References: <20190123144610.8842-1-mreitz@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 1/9] iotests: Re-add filename filters List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, Max Reitz , Kevin Wolf , John Snow 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 --- 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=3D['luks']) iotests.verify_protocol(supported=3D['file']) =20 def blockdev_create(vm, options): - result =3D vm.qmp_log('blockdev-create', job_id=3D'job0', options=3D= options) + result =3D vm.qmp_log('blockdev-create', job_id=3D'job0', options=3D= options, + filters=3D[iotests.filter_qmp_testfiles]) =20 if 'return' in result: assert result['return'] =3D=3D {} @@ -53,7 +54,7 @@ with iotests.FilePath('t.luks') as disk_path, \ 'size': 0 }) =20 vm.qmp_log('blockdev-add', driver=3D'file', filename=3Ddisk_path, - node_name=3D'imgfile') + node_name=3D'imgfile', filters=3D[iotests.filter_qmp_test= files]) =20 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=3D['vdi']) iotests.verify_protocol(supported=3D['file']) =20 def blockdev_create(vm, options): - result =3D vm.qmp_log('blockdev-create', job_id=3D'job0', options=3D= options) + result =3D vm.qmp_log('blockdev-create', job_id=3D'job0', options=3D= options, + filters=3D[iotests.filter_qmp_testfiles]) =20 if 'return' in result: assert result['return'] =3D=3D {} @@ -51,7 +52,7 @@ with iotests.FilePath('t.vdi') as disk_path, \ 'size': 0 }) =20 vm.qmp_log('blockdev-add', driver=3D'file', filename=3Ddisk_path, - node_name=3D'imgfile') + node_name=3D'imgfile', filters=3D[iotests.filter_qmp_test= files]) =20 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=3D['parallel= s']) iotests.verify_protocol(supported=3D['file']) =20 def blockdev_create(vm, options): - result =3D vm.qmp_log('blockdev-create', job_id=3D'job0', options=3D= options) + result =3D vm.qmp_log('blockdev-create', job_id=3D'job0', options=3D= options, + filters=3D[iotests.filter_qmp_testfiles]) =20 if 'return' in result: assert result['return'] =3D=3D {} @@ -51,7 +52,7 @@ with iotests.FilePath('t.parallels') as disk_path, \ 'size': 0 }) =20 vm.qmp_log('blockdev-add', driver=3D'file', filename=3Ddisk_path, - node_name=3D'imgfile') + node_name=3D'imgfile', filters=3D[iotests.filter_qmp_test= files]) =20 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=3D['vhdx']) iotests.verify_protocol(supported=3D['file']) =20 def blockdev_create(vm, options): - result =3D vm.qmp_log('blockdev-create', job_id=3D'job0', options=3D= options) + result =3D vm.qmp_log('blockdev-create', job_id=3D'job0', options=3D= options, + filters=3D[iotests.filter_qmp_testfiles]) =20 if 'return' in result: assert result['return'] =3D=3D {} @@ -51,7 +52,7 @@ with iotests.FilePath('t.vhdx') as disk_path, \ 'size': 0 }) =20 vm.qmp_log('blockdev-add', driver=3D'file', filename=3Ddisk_path, - node_name=3D'imgfile') + node_name=3D'imgfile', filters=3D[iotests.filter_qmp_test= files]) =20 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=3D['vmdk']) =20 def blockdev_create(vm, options): - result =3D vm.qmp_log('blockdev-create', job_id=3D'job0', options=3D= options) + result =3D vm.qmp_log('blockdev-create', job_id=3D'job0', options=3D= options, + filters=3D[iotests.filter_qmp_testfiles]) =20 if 'return' in result: assert result['return'] =3D=3D {} @@ -54,7 +55,7 @@ with iotests.FilePath('t.vmdk') as disk_path, \ 'size': 0 }) =20 vm.qmp_log('blockdev-add', driver=3D'file', filename=3Ddisk_path, - node_name=3D'imgfile') + node_name=3D'imgfile', filters=3D[iotests.filter_qmp_test= files]) =20 blockdev_create(vm, { 'driver': imgfmt, 'file': 'imgfile', --=20 2.20.1