1. Patchew
  2. QEMU
  3. [Qemu-devel] [PATCH v2 0/3] iotests: use python logging
  4. View patch

[Qemu-devel] [PATCH v2 2/3] iotests: add protocol support to initialization info

John Snow posted 3 patches 6 years, 3 months ago
There is a newer version of this series
[Qemu-devel] [PATCH v2 2/3] iotests: add protocol support to initialization info
Posted by John Snow 6 years, 3 months ago 
This will add supported_protocols and unsupported_protocols to all of
iotests.main, iotests.script_main, and 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 ++--
 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 0229ffee0e..d15260e5ad 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -909,7 +909,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.
     """
@@ -925,6 +927,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:
-- 
2.21.0
Re: [Qemu-devel] [PATCH v2 2/3] iotests: add protocol support to initialization info
Posted by Max Reitz 6 years, 2 months ago 
On 29.07.19 23:35, John Snow wrote:
> This will add supported_protocols and unsupported_protocols to all of
> iotests.main, iotests.script_main, and 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 ++--
>  tests/qemu-iotests/iotests.py | 5 ++++-
>  6 files changed, 14 insertions(+), 11 deletions(-)

Hm...  Most of the other script-style tests that do not pass
supported_protocols yet should probably do so, actually.  I’m fairly
certain most of them actually only support 'file'.

Max
Re: [Qemu-devel] [PATCH v2 2/3] iotests: add protocol support to initialization info
Posted by John Snow 6 years, 2 months ago 

On 9/9/19 6:09 AM, Max Reitz wrote:
> On 29.07.19 23:35, John Snow wrote:
>> This will add supported_protocols and unsupported_protocols to all of
>> iotests.main, iotests.script_main, and 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 ++--
>>  tests/qemu-iotests/iotests.py | 5 ++++-
>>  6 files changed, 14 insertions(+), 11 deletions(-)
> 
> Hm...  Most of the other script-style tests that do not pass
> supported_protocols yet should probably do so, actually.  I’m fairly
> certain most of them actually only support 'file'.

Sounds like a follow-up patch.

I guess the protocol information patch you talked about is not at
origin/master yet. Can you point me to it if I need to rebase on top of it?

My V3 still applies cleanly to master and appears to be correct.

--js
Re: [Qemu-devel] [PATCH v2 2/3] iotests: add protocol support to initialization info
Posted by Max Reitz 6 years, 2 months ago 
On 09.09.19 20:45, John Snow wrote:
> 
> 
> On 9/9/19 6:09 AM, Max Reitz wrote:
>> On 29.07.19 23:35, John Snow wrote:
>>> This will add supported_protocols and unsupported_protocols to all of
>>> iotests.main, iotests.script_main, and 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 ++--
>>>  tests/qemu-iotests/iotests.py | 5 ++++-
>>>  6 files changed, 14 insertions(+), 11 deletions(-)
>>
>> Hm...  Most of the other script-style tests that do not pass
>> supported_protocols yet should probably do so, actually.  I’m fairly
>> certain most of them actually only support 'file'.
> 
> Sounds like a follow-up patch.

Why not.  I think it fits well into this series, but either way works
for me.

> I guess the protocol information patch you talked about is not at
> origin/master yet. Can you point me to it if I need to rebase on top of it?

It’s in Kevin’s branch: git://repo.or.cz/qemu/kevin.git block

Max

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.