diff options
Diffstat (limited to 'tests/regressiontests/settings_tests/tests.py')
| -rw-r--r-- | tests/regressiontests/settings_tests/tests.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/regressiontests/settings_tests/tests.py b/tests/regressiontests/settings_tests/tests.py index 493ee8021d..2027382a85 100644 --- a/tests/regressiontests/settings_tests/tests.py +++ b/tests/regressiontests/settings_tests/tests.py @@ -1,4 +1,5 @@ import os +import warnings from django.conf import settings, global_settings from django.core.exceptions import ImproperlyConfigured @@ -274,10 +275,14 @@ 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: |