summaryrefslogtreecommitdiffstats
path: root/testsuite
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2012-08-22 10:27:23 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-08-22 10:27:23 -0400
commit804e07161f9b6d52b110c1e2540d597e08dcdf41 (patch)
tree707cf5c559accce91a7da476b38ce3821a4a6e9c /testsuite
parenta69775edbb64876b740455e90b72cc5da48fee43 (diff)
downloadbcfg2-804e07161f9b6d52b110c1e2540d597e08dcdf41.tar.gz
bcfg2-804e07161f9b6d52b110c1e2540d597e08dcdf41.tar.bz2
bcfg2-804e07161f9b6d52b110c1e2540d597e08dcdf41.zip
fixed skip decorators
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/common.py31
1 files changed, 9 insertions, 22 deletions
diff --git a/testsuite/common.py b/testsuite/common.py
index e40184a35..49c287a70 100644
--- a/testsuite/common.py
+++ b/testsuite/common.py
@@ -60,33 +60,20 @@ else:
def skip(msg):
def decorator(func):
- @wraps(func)
- def inner(*args, **kwargs):
- pass
- return inner
+ return lambda *args, **kwargs: None
return decorator
def skipIf(condition, msg):
- def decorator(func):
- if condition:
- return func
-
- @wraps(func)
- def inner(*args, **kwargs):
- pass
- return inner
- return decorator
+ if not condition:
+ return lambda f: f
+ else:
+ return skip(msg)
def skipUnless(condition, msg):
- def decorator(func):
- if not condition:
- return func
-
- @wraps(func)
- def inner(*args, **kwargs):
- pass
- return inner
- return decorator
+ if condition:
+ return lambda f: f
+ else:
+ return skip(msg)
needs_assertItemsEqual = False