| Message ID | 1421945543-15607-1-git-send-email-mreitz@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 2015-01-22 at 11:52, Max Reitz wrote: > sys.platform may be set to "linux2" instead of just "linux" (in theory, > it could even be set to "linux3" or something else). The Python > documentation on sys.platform recommends testing the prefix of the > platform against "linux", so we should do that. > > Signed-off-by: Max Reitz <mreitz@redhat.com> > --- > tests/qemu-iotests/iotests.py | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) NACK, somehow missed the patch from Fam himself. (And then I didn't use Stefan's block branch but Kevin's, so it was missing there, because Stefan's pull request last week apparently didn't go through) So it's already fixed and this patch is no longer required. Thanks John for pointing it out to me! Max
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 87002e0..da00de5 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -288,7 +288,13 @@ 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: + os_supported = False + for supported_os in supported_oses: + if sys.platform.startswith(supported_os): + os_supported = True + break + + if not os_supported: notrun('not suitable for this OS: %s' % sys.platform) # We need to filter out the time taken from the output so that qemu-iotest
sys.platform may be set to "linux2" instead of just "linux" (in theory, it could even be set to "linux3" or something else). The Python documentation on sys.platform recommends testing the prefix of the platform against "linux", so we should do that. Signed-off-by: Max Reitz <mreitz@redhat.com> --- tests/qemu-iotests/iotests.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)