From 804e07161f9b6d52b110c1e2540d597e08dcdf41 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Wed, 22 Aug 2012 10:27:23 -0400 Subject: fixed skip decorators --- testsuite/common.py | 31 +++++++++---------------------- 1 file changed, 9 insertions(+), 22 deletions(-) (limited to 'testsuite/common.py') 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 -- cgit v1.2.3-1-g7c22