diff options
| author | Russell Keith-Magee <russell@keith-magee.com> | 2011-02-04 14:35:39 +0000 |
|---|---|---|
| committer | Russell Keith-Magee <russell@keith-magee.com> | 2011-02-04 14:35:39 +0000 |
| commit | 46b1fdaba00a208914c5aa7790f02ed577e57f7c (patch) | |
| tree | 2fc8e073c393e89aa96dc38f81e5769482e36dde | |
| parent | bb46b44ec9b81c14d71f078537863b2a6bf18d32 (diff) | |
[1.2.X] Fixed #15016 -- Ensured that the messages tests are isolated from local template directories. Thanks to Gabriel Hurley for the report and patch.
Backport of r15407 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15408 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/contrib/messages/tests/base.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/django/contrib/messages/tests/base.py b/django/contrib/messages/tests/base.py index 2dea5a46d0..6a7700b3ab 100644 --- a/django/contrib/messages/tests/base.py +++ b/django/contrib/messages/tests/base.py @@ -49,6 +49,8 @@ class BaseTest(TestCase): self._message_storage = settings.MESSAGE_STORAGE settings.MESSAGE_STORAGE = '%s.%s' % (self.storage_class.__module__, self.storage_class.__name__) + self.old_TEMPLATE_DIRS = settings.TEMPLATE_DIRS + settings.TEMPLATE_DIRS = () def tearDown(self): for setting in self.restore_settings: @@ -59,6 +61,7 @@ class BaseTest(TestCase): self._template_context_processors settings.INSTALLED_APPS = self._installed_apps settings.MESSAGE_STORAGE = self._message_storage + settings.TEMPLATE_DIRS = self.old_TEMPLATE_DIRS def restore_setting(self, setting): if setting in self._remembered_settings: |