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

[Qemu-devel] [PATCH v2] 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. According to python doc [1], the way to use sys.platform
is "unless you want to test for a specific system version, it is
therefore recommended to use the following idiom":

if sys.platform.startswith('freebsd'):
    # FreeBSD-specific code here...
elif sys.platform.startswith('linux'):
    # Linux-specific code here...

[1]: https://docs.python.org/2.7/library/sys.html#sys.platform

Signed-off-by: Fam Zheng <famz@redhat.com>

---
v2: Don't use any().
    Explain why prefix match is fine.
    (Thanks, Stefan)
---
 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..241b5ee 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 True not in [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 v2] qemu-iotests: Fix supported_oses check

[Stefan Hajnoczi]

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

On Fri, Jan 16, 2015 at 09:38:42AM +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. According to python doc [1], the way to use sys.platform
> is "unless you want to test for a specific system version, it is
> therefore recommended to use the following idiom":
> 
> if sys.platform.startswith('freebsd'):
>     # FreeBSD-specific code here...
> elif sys.platform.startswith('linux'):
>     # Linux-specific code here...
> 
> [1]: https://docs.python.org/2.7/library/sys.html#sys.platform
> 
> Signed-off-by: Fam Zheng <famz@redhat.com>
> 
> ---
> v2: Don't use any().
>     Explain why prefix match is fine.
>     (Thanks, Stefan)
> ---
>  tests/qemu-iotests/iotests.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Thanks, applied to my block tree:
https://github.com/stefanha/qemu/commits/block

Stefan

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

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

[John Snow]

On 01/16/2015 08:23 AM, Stefan Hajnoczi wrote:
> On Fri, Jan 16, 2015 at 09:38:42AM +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. According to python doc [1], the way to use sys.platform
>> is "unless you want to test for a specific system version, it is
>> therefore recommended to use the following idiom":
>>
>> if sys.platform.startswith('freebsd'):
>>      # FreeBSD-specific code here...
>> elif sys.platform.startswith('linux'):
>>      # Linux-specific code here...
>>
>> [1]: https://docs.python.org/2.7/library/sys.html#sys.platform
>>
>> Signed-off-by: Fam Zheng <famz@redhat.com>
>>
>> ---
>> v2: Don't use any().
>>      Explain why prefix match is fine.
>>      (Thanks, Stefan)
>> ---
>>   tests/qemu-iotests/iotests.py | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> Thanks, applied to my block tree:
> https://github.com/stefanha/qemu/commits/block
>
> Stefan
>

Thanks for this!

fake_internet_karma++

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

[Stefan Hajnoczi]

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

On Fri, Jan 16, 2015 at 01:51:53PM -0500, John Snow wrote:
> 
> 
> On 01/16/2015 08:23 AM, Stefan Hajnoczi wrote:
> >On Fri, Jan 16, 2015 at 09:38:42AM +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. According to python doc [1], the way to use sys.platform
> >>is "unless you want to test for a specific system version, it is
> >>therefore recommended to use the following idiom":
> >>
> >>if sys.platform.startswith('freebsd'):
> >>     # FreeBSD-specific code here...
> >>elif sys.platform.startswith('linux'):
> >>     # Linux-specific code here...
> >>
> >>[1]: https://docs.python.org/2.7/library/sys.html#sys.platform
> >>
> >>Signed-off-by: Fam Zheng <famz@redhat.com>
> >>
> >>---
> >>v2: Don't use any().
> >>     Explain why prefix match is fine.
> >>     (Thanks, Stefan)
> >>---
> >>  tests/qemu-iotests/iotests.py | 2 +-
> >>  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> >Thanks, applied to my block tree:
> >https://github.com/stefanha/qemu/commits/block
> >
> >Stefan
> >
> 
> Thanks for this!
> 
> fake_internet_karma++

It's called Reddit^H^H^H^H^H^HQEMU Gold!

Stefan

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