From b3cffde5559c4fa97625512d7ec41a674be26076 Mon Sep 17 00:00:00 2001 From: Jon Dufresne Date: Fri, 13 Apr 2018 13:18:53 -0700 Subject: Fixed #29324 -- Made Settings raise ImproperlyConfigured if SECRET_KEY is accessed and not set. --- tests/admin_scripts/tests.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'tests/admin_scripts') diff --git a/tests/admin_scripts/tests.py b/tests/admin_scripts/tests.py index 3c4e01dfac..17347a476b 100644 --- a/tests/admin_scripts/tests.py +++ b/tests/admin_scripts/tests.py @@ -2213,7 +2213,11 @@ class DiffSettings(AdminScriptTestCase): out, err = self.run_manage(args) self.assertNoOutput(err) self.assertOutput(out, "+ FOO = 'bar'") - self.assertOutput(out, "- SECRET_KEY = ''") + self.assertOutput(out, "- INSTALLED_APPS = []") + self.assertOutput( + out, + "+ INSTALLED_APPS = ['django.contrib.auth', 'django.contrib.contenttypes', 'admin_scripts']" + ) self.assertOutput(out, "+ SECRET_KEY = 'django_tests_secret_key'") self.assertNotInOutput(out, " APPEND_SLASH = True") @@ -2229,7 +2233,12 @@ class DiffSettings(AdminScriptTestCase): self.assertNoOutput(err) self.assertOutput(out, " APPEND_SLASH = True") self.assertOutput(out, "+ FOO = 'bar'") - self.assertOutput(out, "- SECRET_KEY = ''") + self.assertOutput(out, "- INSTALLED_APPS = []") + self.assertOutput( + out, + "+ INSTALLED_APPS = ['django.contrib.auth', 'django.contrib.contenttypes', 'admin_scripts']" + ) + self.assertOutput(out, "+ SECRET_KEY = 'django_tests_secret_key'") class Dumpdata(AdminScriptTestCase): -- cgit v1.3