From 543151d5115049e8d815b51dd2b3470ca573d22c Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Sat, 28 Jul 2012 00:05:49 +0200 Subject: [PATCH] Re-added 1.3 tests. Refs #4. --- .travis.yml | 1 + configurations/tests/test_inheritance.py | 31 ++++++++---------------- configurations/tests/test_main.py | 15 ++++-------- 3 files changed, 16 insertions(+), 31 deletions(-) diff --git a/.travis.yml b/.travis.yml index d4eaa7b..69c5c98 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,4 +12,5 @@ install: script: - make test env: + - DJANGO=1.3 - DJANGO=1.4 diff --git a/configurations/tests/test_inheritance.py b/configurations/tests/test_inheritance.py index cc55acc..8b202d4 100644 --- a/configurations/tests/test_inheritance.py +++ b/configurations/tests/test_inheritance.py @@ -1,5 +1,6 @@ import os +from django.conf import global_settings from django.test import TestCase from mock import patch @@ -12,30 +13,18 @@ class InheritanceTests(TestCase): DJANGO_SETTINGS_MODULE='configurations.tests.settings.single_inheritance') def test_inherited(self): from configurations.tests.settings import single_inheritance - self.assertEquals(single_inheritance.TEMPLATE_CONTEXT_PROCESSORS, ( - 'django.contrib.auth.context_processors.auth', - 'django.core.context_processors.debug', - 'django.core.context_processors.i18n', - 'django.core.context_processors.media', - 'django.core.context_processors.static', - 'django.core.context_processors.tz', - 'django.contrib.messages.context_processors.messages', - 'configurations.tests.settings.base.test_callback', - )) + self.assertEquals(single_inheritance.TEMPLATE_CONTEXT_PROCESSORS, + global_settings.TEMPLATE_CONTEXT_PROCESSORS + ( + 'configurations.tests.settings.base.test_callback', + )) @patch.dict(os.environ, clear=True, DJANGO_CONFIGURATION='Inheritance', DJANGO_SETTINGS_MODULE='configurations.tests.settings.multiple_inheritance') def test_inherited2(self): from configurations.tests.settings import multiple_inheritance - self.assertEquals(multiple_inheritance.TEMPLATE_CONTEXT_PROCESSORS, ( - 'django.contrib.auth.context_processors.auth', - 'django.core.context_processors.debug', - 'django.core.context_processors.i18n', - 'django.core.context_processors.media', - 'django.core.context_processors.static', - 'django.core.context_processors.tz', - 'django.contrib.messages.context_processors.messages', - 'configurations.tests.settings.base.test_callback', - 'configurations.tests.settings.base.test_callback', - )) + self.assertEquals(multiple_inheritance.TEMPLATE_CONTEXT_PROCESSORS, + global_settings.TEMPLATE_CONTEXT_PROCESSORS + ( + 'configurations.tests.settings.base.test_callback', + 'configurations.tests.settings.base.test_callback', + )) diff --git a/configurations/tests/test_main.py b/configurations/tests/test_main.py index ad83eaa..acbb13e 100644 --- a/configurations/tests/test_main.py +++ b/configurations/tests/test_main.py @@ -1,5 +1,6 @@ import os +from django.conf import global_settings from django.test import TestCase from django.core.exceptions import ImproperlyConfigured @@ -13,16 +14,10 @@ class MainTests(TestCase): def test_simple(self): from configurations.tests.settings import main self.assertEquals(main.LALA, 1) - self.assertEquals(main.TEMPLATE_CONTEXT_PROCESSORS, ( - 'django.contrib.auth.context_processors.auth', - 'django.core.context_processors.debug', - 'django.core.context_processors.i18n', - 'django.core.context_processors.media', - 'django.core.context_processors.static', - 'django.core.context_processors.tz', - 'django.contrib.messages.context_processors.messages', - 'configurations.tests.settings.base.test_callback', - )) + self.assertEquals(main.TEMPLATE_CONTEXT_PROCESSORS, + global_settings.TEMPLATE_CONTEXT_PROCESSORS + ( + 'configurations.tests.settings.base.test_callback', + )) self.assertEquals(main.TEST_SETTING, True) def test_global_arrival(self):