motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-04 00:03:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests/functional: Fix broken decorators with lamda functions

Browse source 
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.

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-ID: <20250122134315.1448794-3-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Thomas Huth 2025-01-22 14:43:14 +01:00
parent aca2c48e4d
commit 257de641e0
1 changed files with 19 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

40
tests/functional/qemu_test/decorators.py
View file

@ -17,15 +17,14 @@ Example:
@skipIfMissingCommands("mkisofs", "losetup")
'''
def skipIfMissingCommands(*args):
def has_cmds(cmdlist):
for cmd in cmdlist:
if not which(cmd):
return False
return True
has_cmds = True
for cmd in args:
if not which(cmd):
has_cmds = False
break
return skipUnless(lambda: has_cmds(args),
'required command(s) "%s" not installed' %
", ".join(args))
return skipUnless(has_cmds, 'required command(s) "%s" not installed' %
", ".join(args))
'''
Decorator to skip execution of a test if the current
@ -36,9 +35,9 @@ Example
@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
@ -95,14 +94,13 @@ Example:
@skipIfMissingImports("numpy", "cv2")
'''
def skipIfMissingImports(*args):
def has_imports(importlist):
for impname in importlist:
try:
importlib.import_module(impname)
except ImportError:
return False
return True
has_imports = True
for impname in args:
try:
importlib.import_module(impname)
except ImportError:
has_imports = False
break
return skipUnless(lambda: has_imports(args),
'required import(s) "%s" not installed' %
", ".join(args))
return skipUnless(has_imports, 'required import(s) "%s" not installed' %
", ".join(args))