commit 76a9af2e260983340f50e0bdd07821ba8ca28a63
author Zuul <zuul@review.opendev.org> Thu Feb 11 02:07:55 2021 +0000
committer Gerrit Code Review <review@openstack.org> Thu Feb 11 02:07:55 2021 +0000
tree a7bff696a0b1421b629c32fde78f86e56d49900c
parent 83912f7a6c082626d1f38da2e32332bc0ffae94c
parent cfd0a152612869cf590a5cae8ac447c506eb0110

Merge "Refactor skip_because decorator"

tempest/lib/decorators.py

diff --git a/tempest/lib/decorators.py b/tempest/lib/decorators.py
index ebe2d61..25ff473 100644
--- a/tempest/lib/decorators.py
+++ b/tempest/lib/decorators.py
@@ -72,19 +72,13 @@
     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