Ticket #15064: 15064_DJANGO_SETTINGS_MODULE_ignored_update.diff

django/core/management/__init__.py

@@ -411 +411 @@
     if original_settings_path:
         os.environ['DJANGO_SETTINGS_MODULE'] = original_settings_path
     else:
-        os.environ['DJANGO_SETTINGS_MODULE'] = '%s.%s' % (project_name, settings_name)
+        #If DJANGO_SETTINGS_MODULE is already set, use it.
+        os.environ['DJANGO_SETTINGS_MODULE'] = os.environ.get(
+            'DJANGO_SETTINGS_MODULE',
+            '%s.%s' % (project_name, settings_name)
+        )
 
     # Import the project module. We add the parent directory to PYTHONPATH to
     # avoid some of the path errors new users can have.

tests/regressiontests/settings_tests/tests.py

@@ -1 +1 @@
 from __future__ import with_statement
-from django.conf import settings
+import os
+from django.conf import settings, global_settings
 from django.test import TestCase
 
 class SettingsTests(TestCase):
@@ -100 +101 @@
         self.settings_module.MEDIA_URL = 'http://media.foo.com/stupid//'
         self.assertEqual('http://media.foo.com/stupid//',
                          self.settings_module.MEDIA_URL)
+
+
+class EnvironmentVariableTest(TestCase):
+    """
+    Ensures proper settings file is used in 
+    setup_environ if DJANGO_SETTINGS_MODULE
+    is set in the environment.
+    """
+    def setUp(self):
+        """
+        Make sure DJANGO_SETTINGS_MODULE is not
+        permanently changed by these tests.
+        """
+        def env_restore_func():
+            original_value = os.environ.get('DJANGO_SETTINGS_MODULE')
+
+            def blank_key():
+                if 'DJANGO_SETTINGS_MODULE' in os.environ:
+                    del(os.environ['DJANGO_SETTINGS_MODULE'])
+
+            def restore_current():
+                os.environ['DJANGO_SETTINGS_MODULE'] = original_value
+
+            if original_value:
+                return restore_current
+            else:
+                return blank_key
+                
+        self.restore_env = env_restore_func()
+
+    def test_env_var_used(self):
+        """
+        If the environment variable is set, do
+        not ignore it. However, the kwarg
+        original_settings_path takes precedence.
+
+        This tests both plus the default (neither set).
+        """
+        from django.core.management import setup_environ
+
+        #whatever was already there
+        original_module =  os.environ.get(
+            'DJANGO_SETTINGS_MODULE', 
+            'the default'
+        ) 
+
+        #environment variable set by user
+        user_override = 'custom.settings'
+
+        #optional argument to setup_environ
+        orig_path = 'original.path'
+
+        #expect default
+        setup_environ(global_settings)
+        self.assertEquals(
+            os.environ.get('DJANGO_SETTINGS_MODULE'),
+            original_module
+        )
+
+        #override with environment variable
+        os.environ['DJANGO_SETTINGS_MODULE'] = user_override
+        setup_environ(global_settings)
+
+        self.assertEquals(
+            os.environ.get('DJANGO_SETTINGS_MODULE'),
+            user_override
+        )
+
+        #pass in original_settings_path (takes precedence)
+        os.environ['DJANGO_SETTINGS_MODULE'] = user_override
+        setup_environ(global_settings, original_settings_path = orig_path)
+
+        self.assertEquals(
+            os.environ.get('DJANGO_SETTINGS_MODULE'),
+            orig_path
+        )
+
+    def tearDown(self):
+        self.restore_env()
+