[Qemu-devel] [PATCH] qemu-iotests: Fix supported_oses check

[Qemu-devel] [PATCH] qemu-iotests: Fix supported_oses check

[Fam Zheng]

There is a bug in the recently added sys.platform test and we no longer
run python tests, because "linux2" is the value to compare here. So do a
prefix match, although the python documentation claims Linux is always
linux2.

Signed-off-by: Fam Zheng <famz@redhat.com>
---
 tests/qemu-iotests/iotests.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index 87002e0..4011725 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -288,7 +288,7 @@ def main(supported_fmts=[], supported_oses=['linux']):
     if supported_fmts and (imgfmt not in supported_fmts):
         notrun('not suitable for this image format: %s' % imgfmt)
 
-    if sys.platform not in supported_oses:
+    if not any([sys.platform.startswith(x) for x in supported_oses]):
         notrun('not suitable for this OS: %s' % sys.platform)
 
     # We need to filter out the time taken from the output so that qemu-iotest
-- 
1.9.3

Re: [Qemu-devel] [PATCH] qemu-iotests: Fix supported_oses check

[Stefan Hajnoczi]

[-- Attachment #1: Type: text/plain, Size: 1454 bytes --]

On Thu, Jan 15, 2015 at 01:44:34PM +0800, Fam Zheng wrote:
> There is a bug in the recently added sys.platform test and we no longer
> run python tests, because "linux2" is the value to compare here. So do a
> prefix match, although the python documentation claims Linux is always
> linux2.

It would be good to mention that the docs explicitly suggest using
startswith().

When reviewing this I wasn't sure whether the startswith() comparison is
safe, but knowing the Python docs suggest it means I can be sure this
patch is correct.

> Signed-off-by: Fam Zheng <famz@redhat.com>
> ---
>  tests/qemu-iotests/iotests.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
> index 87002e0..4011725 100644
> --- a/tests/qemu-iotests/iotests.py
> +++ b/tests/qemu-iotests/iotests.py
> @@ -288,7 +288,7 @@ def main(supported_fmts=[], supported_oses=['linux']):
>      if supported_fmts and (imgfmt not in supported_fmts):
>          notrun('not suitable for this image format: %s' % imgfmt)
>  
> -    if sys.platform not in supported_oses:
> +    if not any([sys.platform.startswith(x) for x in supported_oses]):
>          notrun('not suitable for this OS: %s' % sys.platform)

Please don't use any(), we've avoided it to stay compatible with old
Python interpreters:

if True not in [sys.platform.startswith(x) for x in supported_oses]:

[-- Attachment #2: Type: application/pgp-signature, Size: 473 bytes --]