Removed django.core.management.setup_environ and execute_manager.

1 files changed, 0 insertions, 64 deletions

diff --git a/tests/regressiontests/settings_tests/tests.py b/tests/regressiontests/settings_tests/tests.py
index 68f620b5c9..97e43ff0eb 100644
--- a/tests/regressiontests/settings_tests/tests.py
+++ b/tests/regressiontests/settings_tests/tests.py
@@ -287,67 +287,3 @@ class SecureProxySslHeaderTest(TestCase):
         req = HttpRequest()
         req.META['HTTP_X_FORWARDED_PROTOCOL'] = 'https'
         self.assertEqual(req.is_secure(), True)
-
-class EnvironmentVariableTest(TestCase):
-    """
-    Ensures proper settings file is used in setup_environ if
-    DJANGO_SETTINGS_MODULE is set in the environment.
-    """
-    # Decide what to do with these tests when setup_environ() gets removed in Django 1.6
-    def setUp(self):
-        self.original_value = os.environ.get('DJANGO_SETTINGS_MODULE')
-        self.save_warnings_state()
-        warnings.filterwarnings('ignore', category=DeprecationWarning, module='django.core.management')
-
-    def tearDown(self):
-        self.restore_warnings_state()
-        if self.original_value:
-            os.environ['DJANGO_SETTINGS_MODULE'] = self.original_value
-        elif 'DJANGO_SETTINGS_MODULE' in os.environ:
-            del(os.environ['DJANGO_SETTINGS_MODULE'])
-
-    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.assertEqual(
-            os.environ.get('DJANGO_SETTINGS_MODULE'),
-            original_module
-        )
-
-        # override with environment variable
-        os.environ['DJANGO_SETTINGS_MODULE'] = user_override
-        setup_environ(global_settings)
-
-        self.assertEqual(
-            os.environ.get('DJANGO_SETTINGS_MODULE'),
-            user_override
-        )
-
-        # pass in original_settings_path (should take precedence)
-        os.environ['DJANGO_SETTINGS_MODULE'] = user_override
-        setup_environ(global_settings, original_settings_path = orig_path)
-
-        self.assertEqual(
-            os.environ.get('DJANGO_SETTINGS_MODULE'),
-            orig_path
-        )