| Message ID | 20190912001633.11372-4-jsnow@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | iotests: use python logging | expand |
12.09.2019 3:16, John Snow wrote: > Switch from verify_protocols to any one of: > iotests.main, iotests.script_main, iotests.script_initialize. Actually, only script_initialize used in the patch. Also, I think it all may be safely merged to 01 > > Signed-off-by: John Snow <jsnow@redhat.com> Still, Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.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 ++-- > 5 files changed, 10 insertions(+), 10 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/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,
Switch from verify_protocols to any one of: iotests.main, iotests.script_main, iotests.script_initialize. Signed-off-by: John Snow <jsnow@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 ++-- 5 files changed, 10 insertions(+), 10 deletions(-)