summaryrefslogtreecommitdiff
path: root/tests/__init__.py
diff options
context:
space:
mode:
Diffstat (limited to 'tests/__init__.py')
-rw-r--r--tests/__init__.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/tests/__init__.py b/tests/__init__.py
index 9850f3c1..f43975d2 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -36,7 +36,7 @@ def requireNonAsciiLocale(category_name="LC_ALL"):
def _decorate_with_locale(category, try_locales, test_method):
"""Decorate test_method to run after switching to a different locale."""
- def _test_under_locale(testself, sftp):
+ def _test_under_locale(testself, *args, **kwargs):
original = locale.setlocale(category)
while try_locales:
try:
@@ -46,12 +46,11 @@ def _decorate_with_locale(category, try_locales, test_method):
try_locales.pop(0)
else:
try:
- return test_method(testself)
+ return test_method(testself, *args, **kwargs)
finally:
locale.setlocale(category, original)
- skipTest = getattr(testself, "skipTest", None)
- if skipTest is not None:
- skipTest("No usable locales installed")
+ # No locales could be used? Just skip the decorated test :(
+ skip("No usable locales installed")
functools.update_wrapper(_test_under_locale, test_method)
return _test_under_locale