diff options
| author | darkryder <sambhav13085@iiitd.ac.in> | 2015-01-21 22:25:57 +0530 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-02-03 14:59:45 -0500 |
| commit | 9ec8aa5e5d42ac4529846f7eae6bf4982800abff (patch) | |
| tree | 6a1195ff3831031f8207e18e4dcf69015fb4c50c /tests/view_tests | |
| parent | 570912a97d5051fa3aeacd9d16c3be9afcf92198 (diff) | |
Fixed #24149 -- Normalized tuple settings to lists.
Diffstat (limited to 'tests/view_tests')
| -rw-r--r-- | tests/view_tests/tests/test_csrf.py | 4 | ||||
| -rw-r--r-- | tests/view_tests/tests/test_debug.py | 6 | ||||
| -rw-r--r-- | tests/view_tests/tests/test_i18n.py | 12 |
3 files changed, 13 insertions, 9 deletions
diff --git a/tests/view_tests/tests/test_csrf.py b/tests/view_tests/tests/test_csrf.py index 893a7e200b..26ec221e01 100644 --- a/tests/view_tests/tests/test_csrf.py +++ b/tests/view_tests/tests/test_csrf.py @@ -11,11 +11,11 @@ class CsrfViewTests(TestCase): @override_settings( USE_I18N=True, - MIDDLEWARE_CLASSES=( + MIDDLEWARE_CLASSES=[ 'django.middleware.locale.LocaleMiddleware', 'django.middleware.common.CommonMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', - ), + ], ) def test_translation(self): """ diff --git a/tests/view_tests/tests/test_debug.py b/tests/view_tests/tests/test_debug.py index be6ceff1b5..8645bd3e8e 100644 --- a/tests/view_tests/tests/test_debug.py +++ b/tests/view_tests/tests/test_debug.py @@ -546,7 +546,7 @@ class ExceptionReportTestMixin(object): """ Asserts that potentially sensitive info are displayed in the email report. """ - with self.settings(ADMINS=(('Admin', 'admin@fattie-breakie.com'),)): + with self.settings(ADMINS=[('Admin', 'admin@fattie-breakie.com')]): mail.outbox = [] # Empty outbox request = self.rf.post('/some_url/', self.breakfast_data) view(request) @@ -579,7 +579,7 @@ class ExceptionReportTestMixin(object): """ Asserts that certain sensitive info are not displayed in the email report. """ - with self.settings(ADMINS=(('Admin', 'admin@fattie-breakie.com'),)): + with self.settings(ADMINS=[('Admin', 'admin@fattie-breakie.com')]): mail.outbox = [] # Empty outbox request = self.rf.post('/some_url/', self.breakfast_data) view(request) @@ -619,7 +619,7 @@ class ExceptionReportTestMixin(object): """ Asserts that no variables or POST parameters are displayed in the email report. """ - with self.settings(ADMINS=(('Admin', 'admin@fattie-breakie.com'),)): + with self.settings(ADMINS=[('Admin', 'admin@fattie-breakie.com')]): mail.outbox = [] # Empty outbox request = self.rf.post('/some_url/', self.breakfast_data) view(request) diff --git a/tests/view_tests/tests/test_i18n.py b/tests/view_tests/tests/test_i18n.py index 5185a5c458..ba51d3289b 100644 --- a/tests/view_tests/tests/test_i18n.py +++ b/tests/view_tests/tests/test_i18n.py @@ -51,7 +51,7 @@ class I18NTests(TestCase): # we force saving language to a cookie rather than a session # by excluding session middleware and those which do require it test_settings = dict( - MIDDLEWARE_CLASSES=('django.middleware.common.CommonMiddleware',), + MIDDLEWARE_CLASSES=['django.middleware.common.CommonMiddleware'], LANGUAGE_COOKIE_NAME='mylanguage', LANGUAGE_COOKIE_AGE=3600 * 7 * 2, LANGUAGE_COOKIE_DOMAIN='.example.com', @@ -193,9 +193,13 @@ class JsI18NTestsMultiPackage(TestCase): self.assertContains(response, 'este texto de app3 debe ser traducido') def test_i18n_with_locale_paths(self): - extended_locale_paths = settings.LOCALE_PATHS + ( - path.join(path.dirname( - path.dirname(path.abspath(upath(__file__)))), 'app3', 'locale'),) + extended_locale_paths = settings.LOCALE_PATHS + [ + path.join( + path.dirname(path.dirname(path.abspath(upath(__file__)))), + 'app3', + 'locale', + ), + ] with self.settings(LANGUAGE_CODE='es-ar', LOCALE_PATHS=extended_locale_paths): with override('es-ar'): response = self.client.get('/jsi18n/') |