tests/functional: Fix broken decorators with lamda functions
PATCH 1/1 tests/functional: Fix broken decorators with lamda functions
The decorators that use a lambda function are currently broken and do not properly skip the test if the condition is not met. Using "return skipUnless(lambda: ...)" does not work as expected. To fix it, rewrite the decorators without lambda, it's simpler that way anyway.
skipIfMissingImports also needs to exec() the import statement, otherwise we always try to import a module called "impname" which does not exist.
---
I've noticed the problem while trying to get the migration test through the CI:
https://gitlab.com/thuth/qemu/-/jobs/8901960783#L100
... the OpenSUSE containers apparently lack the "nc" binary ...
tests/functional/qemu_test/decorators.py | 44 +++++++++++------------- 1 file changed, 21 insertions(+), 23 deletions(-)
tests/functional/qemu_test/decorators.py +21 -23
@@ -16,15 +16,14 @@ @skipIfMissingCommands("mkisofs", "losetup") ''' def skipIfMissingCommands(*args): - def has_cmds(cmdlist): - for cmd in cmdlist: - if not which(cmd): - return False - return True - - return skipUnless(lambda: has_cmds(args), - 'required command(s) "%s" not installed' % - ", ".join(args)) + has_cmds = True + for cmd in args: + if not which(cmd): + has_cmds = False + break + + return skipUnless(has_cmds, 'required command(s) "%s" not installed' % + ", ".join(args)) ''' Decorator to skip execution of a test if the current
@@ -35,9 +34,9 @@ def has_cmds(cmdlist): @skipIfNotMachine("x86_64", "aarch64") ''' def skipIfNotMachine(*args): - return skipUnless(lambda: platform.machine() in args, - 'not running on one of the required machine(s) "%s"' % - ", ".join(args)) + return skipUnless(platform.machine() in args, + 'not running on one of the required machine(s) "%s"' % + ", ".join(args)) ''' Decorator to skip execution of flaky tests, unless
@@ -94,14 +93,13 @@ def skipBigDataTest(): @skipIfMissingImports("numpy", "cv2") ''' def skipIfMissingImports(*args): - def has_imports(importlist): - for impname in importlist: - try: - import impname - except ImportError: - return False - return True - - return skipUnless(lambda: has_imports(args), - 'required import(s) "%s" not installed' % - ", ".join(args)) + has_imports = True + for impname in args: + try: + exec('import %s' % impname) + except ImportError: + has_imports = False + break + + return skipUnless(has_imports, 'required import(s) "%s" not installed' % + ", ".join(args))
Signature · 1 line
2.48.1
Quoted 5 lines · Thomas Huth
The decorators that use a lambda function are currently broken and do not properly skip the test if the condition is not met. Using "return skipUnless(lambda: ...)" does not work as expected. To fix it, rewrite the decorators without lambda, it's simpler that way anyway.
Urgh, I clearly failed to re-test this properly. Originally I wasn't using skipUnless as a helper, but had implemented something that looked pretty much like skipUnless and then refactored it :-(
Quoted 4 lines
skipIfMissingImports also needs to
exec()the import statement, otherwise we always try to import a module called "impname" which does not exist.
Worth doing this as a separate commit.
Quoted 61 lines
Signed-off-by Thomas Huth <[email protected]>---
I've noticed the problem while trying to get the migration test through the CI:
https://gitlab.com/thuth/qemu/-/jobs/8901960783#L100
... the OpenSUSE containers apparently lack the "nc" binary ...tests/functional/qemu_test/decorators.py | 44 +++++++++++------------- 1 file changed, 21 insertions(+), 23 deletions(-)tests/functional/qemu_test/decorators.py +11
-17@@ -16,15 +16,14 @@ @skipIfMissingCommands("mkisofs", "losetup") ''' def skipIfMissingCommands(*args): - def has_cmds(cmdlist): - for cmd in cmdlist: - if not which(cmd): - return False - return True - - return skipUnless(lambda: has_cmds(args), - 'required command(s) "%s" not installed' % - ", ".join(args)) + has_cmds = True + for cmd in args: + if not which(cmd): + has_cmds = False + break + + return skipUnless(has_cmds, 'required command(s) "%s" not installed' % + ", ".join(args)) ''' Decorator to skip execution of a test if the current@@ -35,9 +34,9 @@ def has_cmds(cmdlist): @skipIfNotMachine("x86_64", "aarch64") ''' def skipIfNotMachine(*args): - return skipUnless(lambda: platform.machine() in args, - 'not running on one of the required machine(s) "%s"' % - ", ".join(args)) + return skipUnless(platform.machine() in args, + 'not running on one of the required machine(s) "%s"' % + ", ".join(args)) ''' Decorator to skip execution of flaky tests, unless@@ -94,14 +93,13 @@ def skipBigDataTest(): @skipIfMissingImports("numpy", "cv2") ''' def skipIfMissingImports(*args): - def has_imports(importlist): - for impname in importlist: - try: - import impname - except ImportError:
tests/functional/qemu_test/decorators.py def skipBigDataTest(): · line 99
Quoted 10 lines
tests/functional/qemu_test/decorators.py +4
-6- return False - return True - - return skipUnless(lambda: has_imports(args), - 'required import(s) "%s" not installed' % - ", ".join(args)) + has_imports = True + for impname in args: + try: + exec('import %s' % impname)
I feel like the recommended approach would probably be to use
importlib.import_module(impname)
tests/functional/qemu_test/decorators.py def skipBigDataTest(): · line 105
Quoted 6 lines
tests/functional/qemu_test/decorators.py +6
-0+ except ImportError: + has_imports = False + break + + return skipUnless(has_imports, 'required import(s) "%s" not installed' % + ", ".join(args))
With regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|