Author: mtredinnick
Date: 2007-10-21 12:26:32 -0500 (Sun, 21 Oct 2007)
New Revision: 6583
Modified:
django/trunk/django/test/utils.py
django/trunk/tests/runtests.py
Log:
Modified the test harness to respect the LANGUAGE_CODE setting. Also changed
Django's own test runner to always use 'en' for LANGUAGE_CODE when testing
core. Fixed #4709
Modified: django/trunk/django/test/utils.py
===================================================================
--- django/trunk/django/test/utils.py 2007-10-21 17:14:25 UTC (rev 6582)
+++ django/trunk/django/test/utils.py 2007-10-21 17:26:32 UTC (rev 6583)
@@ -6,6 +6,7 @@
from django.dispatch import dispatcher
from django.test import signals
from django.template import Template
+from django.utils.translation import deactivate
# The prefix to put on the default database name when creating
# the test database.
@@ -43,7 +44,7 @@
- Installing the instrumented test renderer
- Diverting the email sending functions to a test buffer
-
+ - Setting the active locale to match the LANGUAGE_CODE setting.
"""
Template.original_render = Template.render
Template.render = instrumented_test_render
@@ -53,6 +54,8 @@
mail.outbox = []
+ deactivate()
+
def teardown_test_environment():
"""Perform any global post-test teardown. This involves:
Modified: django/trunk/tests/runtests.py
===================================================================
--- django/trunk/tests/runtests.py 2007-10-21 17:14:25 UTC (rev 6582)
+++ django/trunk/tests/runtests.py 2007-10-21 17:26:32 UTC (rev 6583)
@@ -93,6 +93,7 @@
old_root_urlconf = settings.ROOT_URLCONF
old_template_dirs = settings.TEMPLATE_DIRS
old_use_i18n = settings.USE_I18N
+ old_language_code = settings.LANGUAGE_CODE
old_middleware_classes = settings.MIDDLEWARE_CLASSES
# Redirect some settings for the duration of these tests.
@@ -100,6 +101,7 @@
settings.ROOT_URLCONF = 'urls'
settings.TEMPLATE_DIRS = (os.path.join(os.path.dirname(__file__),
TEST_TEMPLATE_DIR),)
settings.USE_I18N = True
+ settings.LANGUAGE_CODE = 'en'
settings.MIDDLEWARE_CLASSES = (
'django.contrib.sessions.middleware.SessionMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
@@ -151,6 +153,7 @@
settings.ROOT_URLCONF = old_root_urlconf
settings.TEMPLATE_DIRS = old_template_dirs
settings.USE_I18N = old_use_i18n
+ settings.LANGUAGE_CODE = old_language_code
settings.MIDDLEWARE_CLASSES = old_middleware_classes
if __name__ == "__main__":
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
