Re-added 1.3 tests. Refs #4.

This commit is contained in:
Jannis Leidel 2012-07-28 00:05:49 +02:00
parent 5e9b066d21
commit 543151d511
3 changed files with 16 additions and 31 deletions

View file

@ -12,4 +12,5 @@ install:
script:
- make test
env:
- DJANGO=1.3
- DJANGO=1.4

View file

@ -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',
))

View file

@ -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):