| Message ID | 20250403151829.44858-3-philmd@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | hw/arm: Tests & ACPI tables fixes for 10.0 | expand |
On 4/3/25 08:18, Philippe Mathieu-Daudé wrote: > +Decorator to skip execution of a test if the current > +host operating system does not match one of the permitted > +ones. > +Example > + > + @skipIfOperatingSystem("Linux", "Darwin") > +''' > +def skipIfOperatingSystem(*args): > + return skipIf(platform.system() in args, > + 'not running on one of the required OS(s) "%s"' % s/required/prohibited/ ? With that, or similar wording, Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
On 03/04/2025 17.18, Philippe Mathieu-Daudé wrote: > Since tests might be failing on some operating systems, > introduce the skipIfOperatingSystem() decorator. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > tests/functional/qemu_test/__init__.py | 2 +- > tests/functional/qemu_test/decorators.py | 15 ++++++++++++++- > 2 files changed, 15 insertions(+), 2 deletions(-) > > diff --git a/tests/functional/qemu_test/__init__.py b/tests/functional/qemu_test/__init__.py > index 45f7befa374..af41c2c6a22 100644 > --- a/tests/functional/qemu_test/__init__.py > +++ b/tests/functional/qemu_test/__init__.py > @@ -15,6 +15,6 @@ > from .linuxkernel import LinuxKernelTest > from .decorators import skipIfMissingCommands, skipIfNotMachine, \ > skipFlakyTest, skipUntrustedTest, skipBigDataTest, skipSlowTest, \ > - skipIfMissingImports > + skipIfMissingImports, skipIfOperatingSystem > from .archive import archive_extract > from .uncompress import uncompress > diff --git a/tests/functional/qemu_test/decorators.py b/tests/functional/qemu_test/decorators.py > index 1651eb739a7..b6a1d41c55c 100644 > --- a/tests/functional/qemu_test/decorators.py > +++ b/tests/functional/qemu_test/decorators.py > @@ -5,7 +5,7 @@ > import importlib > import os > import platform > -from unittest import skipUnless > +from unittest import skipIf, skipUnless > > from .cmd import which > > @@ -26,6 +26,19 @@ def skipIfMissingCommands(*args): > return skipUnless(has_cmds, 'required command(s) "%s" not installed' % > ", ".join(args)) > > +''' > +Decorator to skip execution of a test if the current > +host operating system does not match one of the permitted > +ones. "permitted ones" sounds like you'd need to specify the ones that are allowed to run the test, but it's rather the other way round, you have to specify the ones that are not able to run the test. I'd suggest to rewrite the comment accordingly. > +Example > + > + @skipIfOperatingSystem("Linux", "Darwin") > +''' > +def skipIfOperatingSystem(*args): > + return skipIf(platform.system() in args, > + 'not running on one of the required OS(s) "%s"' % Same here, maybe rather: "running on an OS (%s) that is not able to run this test" ? Thomas
On 3/4/25 20:04, Thomas Huth wrote: > On 03/04/2025 17.18, Philippe Mathieu-Daudé wrote: >> Since tests might be failing on some operating systems, >> introduce the skipIfOperatingSystem() decorator. >> >> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> >> --- >> tests/functional/qemu_test/__init__.py | 2 +- >> tests/functional/qemu_test/decorators.py | 15 ++++++++++++++- >> 2 files changed, 15 insertions(+), 2 deletions(-) >> diff --git a/tests/functional/qemu_test/decorators.py b/tests/ >> functional/qemu_test/decorators.py >> index 1651eb739a7..b6a1d41c55c 100644 >> --- a/tests/functional/qemu_test/decorators.py >> +++ b/tests/functional/qemu_test/decorators.py >> @@ -5,7 +5,7 @@ >> import importlib >> import os >> import platform >> -from unittest import skipUnless >> +from unittest import skipIf, skipUnless >> from .cmd import which >> @@ -26,6 +26,19 @@ def skipIfMissingCommands(*args): >> return skipUnless(has_cmds, 'required command(s) "%s" not >> installed' % >> ", ".join(args)) >> +''' >> +Decorator to skip execution of a test if the current >> +host operating system does not match one of the permitted >> +ones. > > "permitted ones" sounds like you'd need to specify the ones that are > allowed to run the test, but it's rather the other way round, you have > to specify the ones that are not able to run the test. I'd suggest to > rewrite the comment accordingly. > >> +Example >> + >> + @skipIfOperatingSystem("Linux", "Darwin") >> +''' >> +def skipIfOperatingSystem(*args): >> + return skipIf(platform.system() in args, >> + 'not running on one of the required OS(s) "%s"' % > > Same here, maybe rather: "running on an OS (%s) that is not able to run > this test" ? Yes indeed, thanks!
diff --git a/tests/functional/qemu_test/__init__.py b/tests/functional/qemu_test/__init__.py index 45f7befa374..af41c2c6a22 100644 --- a/tests/functional/qemu_test/__init__.py +++ b/tests/functional/qemu_test/__init__.py @@ -15,6 +15,6 @@ from .linuxkernel import LinuxKernelTest from .decorators import skipIfMissingCommands, skipIfNotMachine, \ skipFlakyTest, skipUntrustedTest, skipBigDataTest, skipSlowTest, \ - skipIfMissingImports + skipIfMissingImports, skipIfOperatingSystem from .archive import archive_extract from .uncompress import uncompress diff --git a/tests/functional/qemu_test/decorators.py b/tests/functional/qemu_test/decorators.py index 1651eb739a7..b6a1d41c55c 100644 --- a/tests/functional/qemu_test/decorators.py +++ b/tests/functional/qemu_test/decorators.py @@ -5,7 +5,7 @@ import importlib import os import platform -from unittest import skipUnless +from unittest import skipIf, skipUnless from .cmd import which @@ -26,6 +26,19 @@ def skipIfMissingCommands(*args): return skipUnless(has_cmds, 'required command(s) "%s" not installed' % ", ".join(args)) +''' +Decorator to skip execution of a test if the current +host operating system does not match one of the permitted +ones. +Example + + @skipIfOperatingSystem("Linux", "Darwin") +''' +def skipIfOperatingSystem(*args): + return skipIf(platform.system() in args, + 'not running on one of the required OS(s) "%s"' % + ", ".join(args)) + ''' Decorator to skip execution of a test if the current host machine does not match one of the permitted
Since tests might be failing on some operating systems, introduce the skipIfOperatingSystem() decorator. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- tests/functional/qemu_test/__init__.py | 2 +- tests/functional/qemu_test/decorators.py | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-)