summaryrefslogtreecommitdiff
path: root/tests/settings_tests
diff options
context:
space:
mode:
authorMorgan Aubert <morgan.aubert@impakfinance.com>2018-04-27 17:18:15 -0400
committerTim Graham <timograham@gmail.com>2018-05-09 11:40:28 -0400
commit704443acacf0dfbcb1c52df4b260585055754ce7 (patch)
tree600147bf6114d7b490fcd253ff9797b7e7531c09 /tests/settings_tests
parent7ba040de7703fd06b9b35ddd31da40103d911c30 (diff)
Fixed #29363 -- Added SimpleTestCase.assertWarnsMessage().
Diffstat (limited to 'tests/settings_tests')
-rw-r--r--tests/settings_tests/tests.py11
1 files changed, 3 insertions, 8 deletions
diff --git a/tests/settings_tests/tests.py b/tests/settings_tests/tests.py
index 9187f87388..53a9ea98f6 100644
--- a/tests/settings_tests/tests.py
+++ b/tests/settings_tests/tests.py
@@ -1,7 +1,6 @@
import os
import sys
import unittest
-import warnings
from types import ModuleType
from unittest import mock
@@ -349,15 +348,11 @@ class TestComplexSettingOverride(SimpleTestCase):
def test_complex_override_warning(self):
"""Regression test for #19031"""
- with warnings.catch_warnings(record=True) as w:
- warnings.simplefilter("always")
-
+ msg = 'Overriding setting TEST_WARN can lead to unexpected behavior.'
+ with self.assertWarnsMessage(UserWarning, msg) as cm:
with override_settings(TEST_WARN='override'):
self.assertEqual(settings.TEST_WARN, 'override')
-
- self.assertEqual(len(w), 1)
- self.assertEqual(w[0].filename, __file__)
- self.assertEqual(str(w[0].message), 'Overriding setting TEST_WARN can lead to unexpected behavior.')
+ self.assertEqual(cm.filename, __file__)
class SecureProxySslHeaderTest(SimpleTestCase):