diff options
| author | Tim Graham <timograham@gmail.com> | 2015-02-10 08:44:52 -0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-02-11 11:55:53 -0500 |
| commit | 44df17d53cbf2c60bdc2835d8aebca20930e0c14 (patch) | |
| tree | 2986a88534116c735fd94421d0c4fe13d593ca91 | |
| parent | c0f0f93b5d3d100f0d975215fa4a354962f9d416 (diff) | |
[1.8.x] Moved contrib.humanize tests out of contrib.
Backport of 8192a164defa24d75672e6b10cec650489b8c748 from master
| -rw-r--r-- | tests/humanize_tests/__init__.py | 0 | ||||
| -rw-r--r-- | tests/humanize_tests/tests.py (renamed from django/contrib/humanize/tests.py) | 3 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tests/humanize_tests/__init__.py b/tests/humanize_tests/__init__.py new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/tests/humanize_tests/__init__.py diff --git a/django/contrib/humanize/tests.py b/tests/humanize_tests/tests.py index 84528fd29d..f5dc3edfc7 100644 --- a/django/contrib/humanize/tests.py +++ b/tests/humanize_tests/tests.py @@ -6,7 +6,7 @@ from unittest import skipIf from django.contrib.humanize.templatetags import humanize from django.template import Context, Template, defaultfilters -from django.test import TestCase, override_settings +from django.test import TestCase, modify_settings, override_settings from django.utils import translation from django.utils.html import escape from django.utils.timezone import get_fixed_timezone, utc @@ -35,6 +35,7 @@ class MockDateTime(datetime.datetime): return now.replace(tzinfo=tz) + tz.utcoffset(now) +@modify_settings(INSTALLED_APPS={'append': 'django.contrib.humanize'}) class HumanizeTests(TestCase): def humanize_tester(self, test_list, result_list, method, normalize_result_func=escape): |
