diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/testutils.py | 33 |
1 files changed, 2 insertions, 31 deletions
diff --git a/tests/testutils.py b/tests/testutils.py index ba31e3b..0340189 100644 --- a/tests/testutils.py +++ b/tests/testutils.py @@ -32,37 +32,8 @@ from functools import wraps from testconfig import dsn, repl_dsn -if hasattr(unittest, 'skipIf'): - skip = unittest.skip - skipIf = unittest.skipIf - -else: - import warnings - - def skipIf(cond, msg): - def skipIf_(f): - @wraps(f) - def skipIf__(self): - if cond: - with warnings.catch_warnings(): - warnings.simplefilter('always', UserWarning) - warnings.warn(msg) - return - else: - return f(self) - return skipIf__ - return skipIf_ - - def skip(msg): - return skipIf(True, msg) - - def skipTest(self, msg): - with warnings.catch_warnings(): - warnings.simplefilter('always', UserWarning) - warnings.warn(msg) - return - - unittest.TestCase.skipTest = skipTest +skip = unittest.skip +skipIf = unittest.skipIf # Silence warnings caused by the stubbornness of the Python unittest # maintainers |