From 87f187b960e82da01aa13f329552e1608c339326 Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Mon, 17 Nov 2014 23:26:04 +0100 Subject: [PATCH] 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). --- tests/settings_tests/tests.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/tests/settings_tests/tests.py b/tests/settings_tests/tests.py index 64f99fc859b..b2681f43175 100644 --- a/tests/settings_tests/tests.py +++ b/tests/settings_tests/tests.py @@ -275,14 +275,6 @@ class SettingsTests(TestCase): self.assertRaises(AttributeError, getattr, settings, 'TEST') 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): def setUp(self): @@ -453,7 +445,12 @@ class TestTupleSettings(unittest.TestCase): Make sure settings that should be tuples throw ImproperlyConfigured if they 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): settings_module = ModuleType('fake_settings_module')