openstack/tempest
Code Issues Proposed changes

Merge "Fix skip_because decorator"

Browse Source
This commit is contained in:
Jenkins 2013-10-07 16:09:41 +00:00 committed by Gerrit Code Review
commit 1ba23be265
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tempest/test.py
View File

@ -16,6 +16,7 @@
# under the License.
import atexit
import functools
import os
import time
@ -110,11 +111,14 @@ def skip_because(*args, **kwargs):
@param condition: optional condition to be True for the skip to have place
"""
def decorator(f):
if "bug" in kwargs:
if "condition" not in kwargs or kwargs["condition"] is True:
msg = "Skipped until Bug: %s is resolved." % kwargs["bug"]
raise testtools.TestCase.skipException(msg)
return f
@functools.wraps(f)
def wrapper(*func_args, **func_kwargs):
if "bug" in kwargs:
if "condition" not in kwargs or kwargs["condition"] is True:
msg = "Skipped until Bug: %s is resolved." % kwargs["bug"]
raise testtools.TestCase.skipException(msg)
return f(*func_args, **func_kwargs)
return wrapper
return decorator