openstack
/
tempest
Code Issues Proposed changes

Refactor skip_because decorator 

skip_because should be skipped by default.
The skip param is not needed here , condition is set to True always
In case condition is False we do not skip .

I think it reduces the nested if and overhead.
Making the code clear and readable

Change-Id: Ie24263bb73805001ba85c27073f6a7de31793323
This commit is contained in:
Benny Kopilov 2021-01-27 07:11:32 +02:00
parent 1b0cddc90d
commit cfd0a15261
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tempest/lib/decorators.py
View File

@ -72,19 +72,13 @@ def skip_because(*args, **kwargs):
def decorator(f):
@functools.wraps(f)
def wrapper(*func_args, **func_kwargs):
skip = False
msg = ''
if "condition" in kwargs:
if kwargs["condition"] is True:
skip = True
else:
skip = True
if "bug" in kwargs and skip is True:
bug = kwargs['bug']
condition = kwargs.get('condition', True)
bug = kwargs.get('bug', None)
if bug and condition:
bug_type = kwargs.get('bug_type', 'launchpad')
bug_url = _get_bug_url(bug, bug_type)
msg = "Skipped until bug: %s is resolved." % bug_url
raise testtools.TestCase.skipException(msg)
raise testtools.TestCase.skipException(
"Skipped until bug: %s is resolved." % bug_url)
return f(*func_args, **func_kwargs)
return wrapper
return decorator