diff options
| author | Jon Dufresne <jon.dufresne@gmail.com> | 2016-06-16 11:19:18 -0700 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2016-06-16 14:21:14 -0400 |
| commit | 13d60298ea2a07242dc3952a9dfcd9c8857bf1f9 (patch) | |
| tree | 230d0f843401781e9b2062fe3c1f929655a5527e /tests/settings_tests | |
| parent | 70b7d6b4ea0cbd67406d193f0a7fed7e290d1eb6 (diff) | |
[1.10.x] Fixed #26747 -- Used more specific assertions in the Django test suite.
Backport of 4f336f66523001b009ab038b10848508fd208b3b from master
Diffstat (limited to 'tests/settings_tests')
| -rw-r--r-- | tests/settings_tests/tests.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/settings_tests/tests.py b/tests/settings_tests/tests.py index e5e034115e..19ffcc084d 100644 --- a/tests/settings_tests/tests.py +++ b/tests/settings_tests/tests.py @@ -221,7 +221,7 @@ class SettingsTests(SimpleTestCase): getattr(settings, 'TEST') with self.settings(TEST='override'): self.assertEqual(self.testvalue, 'override') - self.assertEqual(self.testvalue, None) + self.assertIsNone(self.testvalue) @override_settings(TEST='override') def test_signal_callback_decorator(self): @@ -403,24 +403,24 @@ class SecureProxySslHeaderTest(SimpleTestCase): def test_none(self): self.settings_module.SECURE_PROXY_SSL_HEADER = None req = HttpRequest() - self.assertEqual(req.is_secure(), False) + self.assertIs(req.is_secure(), False) def test_set_without_xheader(self): self.settings_module.SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTOCOL', 'https') req = HttpRequest() - self.assertEqual(req.is_secure(), False) + self.assertIs(req.is_secure(), False) def test_set_with_xheader_wrong(self): self.settings_module.SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTOCOL', 'https') req = HttpRequest() req.META['HTTP_X_FORWARDED_PROTOCOL'] = 'wrongvalue' - self.assertEqual(req.is_secure(), False) + self.assertIs(req.is_secure(), False) def test_set_with_xheader_right(self): self.settings_module.SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTOCOL', 'https') req = HttpRequest() req.META['HTTP_X_FORWARDED_PROTOCOL'] = 'https' - self.assertEqual(req.is_secure(), True) + self.assertIs(req.is_secure(), True) class IsOverriddenTest(SimpleTestCase): |