summaryrefslogtreecommitdiff
path: root/tests/admin_scripts
diff options
context:
space:
mode:
authorPaweł Marczewski <pwmarcz@gmail.com>2016-11-05 12:31:37 +0100
committerTim Graham <timograham@gmail.com>2016-11-10 07:50:49 -0500
commit50f9e736fa701664c5659d0653aff75b7f4489b6 (patch)
treed19a19558e570cef0d6f24786214eb421a69f304 /tests/admin_scripts
parent373c6c409c310cb61e1e9c9aff4adba379ffd0b4 (diff)
downloaddjango-50f9e736fa701664c5659d0653aff75b7f4489b6.tar.gz
Fixed #27438 -- Added the diffsettings --default option.
Diffstat (limited to 'tests/admin_scripts')
-rw-r--r--tests/admin_scripts/tests.py14
1 files changed, 14 insertions, 0 deletions
diff --git a/tests/admin_scripts/tests.py b/tests/admin_scripts/tests.py
index 84b44931b3..329263db0a 100644
--- a/tests/admin_scripts/tests.py
+++ b/tests/admin_scripts/tests.py
@@ -2128,6 +2128,20 @@ class DiffSettings(AdminScriptTestCase):
self.assertNoOutput(err)
self.assertOutput(out, "### STATIC_URL = None")
+ def test_custom_default(self):
+ """
+ The --default option specifies an alternate settings module for
+ comparison.
+ """
+ self.write_settings('settings_default.py', sdict={'FOO': '"foo"', 'BAR': '"bar1"'})
+ self.addCleanup(self.remove_settings, 'settings_default.py')
+ self.write_settings('settings_to_diff.py', sdict={'FOO': '"foo"', 'BAR': '"bar2"'})
+ self.addCleanup(self.remove_settings, 'settings_to_diff.py')
+ out, err = self.run_manage(['diffsettings', '--settings=settings_to_diff', '--default=settings_default'])
+ self.assertNoOutput(err)
+ self.assertNotInOutput(out, "FOO")
+ self.assertOutput(out, "BAR = 'bar2'")
+
class Dumpdata(AdminScriptTestCase):
"""Tests for dumpdata management command."""