mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-24 06:06:09 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #29236 -- Fixed diffsettings crash if using settings.configure().

Browse Source
This commit is contained in:
Hasan Ramezani
2018-08-18 23:57:39 +04:30
committed by Tim Graham
parent cfb4845f06
commit 49b679371f
4 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/admin_scripts/configured_settings_manage.py Normal file
View File

@@ -0,0 +1,9 @@
#!/usr/bin/env python
import sys
from django.conf import settings
from django.core.management import execute_from_command_line
if __name__ == '__main__':
settings.configure(DEBUG=True)
execute_from_command_line(sys.argv)

15
tests/admin_scripts/tests.py
View File

@@ -159,16 +159,18 @@ class AdminScriptTestCase(unittest.TestCase):
script_dir = os.path.abspath(os.path.join(os.path.dirname(django.__file__), 'bin'))
return self.run_test(os.path.join(script_dir, 'django-admin.py'), args, settings_file)
def run_manage(self, args, settings_file=None):
def run_manage(self, args, settings_file=None, configured_settings=False):
def safe_remove(path):
try:
os.remove(path)
except OSError:
pass
conf_dir = os.path.dirname(conf.__file__)
template_manage_py = os.path.join(conf_dir, 'project_template', 'manage.py-tpl')
template_manage_py = (
os.path.join(os.path.dirname(__file__), 'configured_settings_manage.py')
if configured_settings else
os.path.join(os.path.dirname(conf.__file__), 'project_template', 'manage.py-tpl')
)
test_manage_py = os.path.join(self.test_dir, 'manage.py')
shutil.copyfile(template_manage_py, test_manage_py)
@@ -2182,6 +2184,11 @@ class DiffSettings(AdminScriptTestCase):
self.assertNoOutput(err)
self.assertOutput(out, "FOO = 'bar' ###")
def test_settings_configured(self):
out, err = self.run_manage(['diffsettings'], configured_settings=True)
self.assertNoOutput(err)
self.assertOutput(out, 'DEBUG = True')
def test_all(self):
"""The all option also shows settings with the default value."""
self.write_settings('settings_to_diff.py', sdict={'STATIC_URL': 'None'})