p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Adjusted tests for previous commit. 

The test was testing a use case that doesn't happen in real world
projects: developers don't assign settings at run time (and Django
explicitly doesn't support it).
This commit is contained in:
Aymeric Augustin 2014-11-17 23:26:04 +01:00
parent 4b9eb7602d
commit 87f187b960
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/settings_tests/tests.py
View File

@ -275,14 +275,6 @@ class SettingsTests(TestCase):
self.assertRaises(AttributeError, getattr, settings, 'TEST') self.assertRaises(AttributeError, getattr, settings, 'TEST')
self.assertRaises(AttributeError, getattr, settings, 'TEST2') self.assertRaises(AttributeError, getattr, settings, 'TEST2')
def test_allowed_include_roots_string(self):
"""
ALLOWED_INCLUDE_ROOTS is not allowed to be incorrectly set to a string
rather than a tuple.
"""
self.assertRaises(ValueError, setattr, settings,
'ALLOWED_INCLUDE_ROOTS', '/var/www/ssi/')
class TestComplexSettingOverride(TestCase): class TestComplexSettingOverride(TestCase):
def setUp(self): def setUp(self):
@ -453,7 +445,12 @@ class TestTupleSettings(unittest.TestCase):
Make sure settings that should be tuples throw ImproperlyConfigured if they Make sure settings that should be tuples throw ImproperlyConfigured if they
are set to a string instead of a tuple. are set to a string instead of a tuple.
""" """
tuple_settings = ("INSTALLED_APPS", "TEMPLATE_DIRS", "LOCALE_PATHS") tuple_settings = (
"ALLOWED_INCLUDE_ROOTS",
"INSTALLED_APPS",
"TEMPLATE_DIRS",
"LOCALE_PATHS",
)
def test_tuple_settings(self): def test_tuple_settings(self):
settings_module = ModuleType('fake_settings_module') settings_module = ModuleType('fake_settings_module')