summaryrefslogtreecommitdiff
path: root/tests/logging_tests
diff options
context:
space:
mode:
authorBerker Peksag <berker.peksag@gmail.com>2014-10-28 12:02:56 +0200
committerTim Graham <timograham@gmail.com>2014-11-03 11:56:37 -0500
commitf7969b0920c403118656f6bfec58d6454d79ef1a (patch)
tree866df7de0524251323fef2b4262e672150d95f00 /tests/logging_tests
parentc0c78f1b707f825eee974c65515a837f8cf46e66 (diff)
downloaddjango-f7969b0920c403118656f6bfec58d6454d79ef1a.tar.gz
Fixed #23620 -- Used more specific assertions in the Django test suite.
Diffstat (limited to 'tests/logging_tests')
-rw-r--r--tests/logging_tests/tests.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/logging_tests/tests.py b/tests/logging_tests/tests.py
index 71368cc9c3..99981e56e1 100644
--- a/tests/logging_tests/tests.py
+++ b/tests/logging_tests/tests.py
@@ -123,12 +123,12 @@ class WarningLoggerTests(TestCase):
def test_warnings_capture(self):
warnings.warn('Foo Deprecated', RemovedInNextVersionWarning)
output = force_text(self.outputs[0].getvalue())
- self.assertTrue('Foo Deprecated' in output)
+ self.assertIn('Foo Deprecated', output)
def test_warnings_capture_debug_false(self):
warnings.warn('Foo Deprecated', RemovedInNextVersionWarning)
output = force_text(self.outputs[0].getvalue())
- self.assertFalse('Foo Deprecated' in output)
+ self.assertNotIn('Foo Deprecated', output)
@override_settings(DEBUG=True)
def test_error_filter_still_raises(self):
@@ -263,8 +263,8 @@ class AdminEmailHandlerTest(TestCase):
self.logger.error(message)
self.assertEqual(len(mail.outbox), 1)
- self.assertFalse('\n' in mail.outbox[0].subject)
- self.assertFalse('\r' in mail.outbox[0].subject)
+ self.assertNotIn('\n', mail.outbox[0].subject)
+ self.assertNotIn('\r', mail.outbox[0].subject)
self.assertEqual(mail.outbox[0].subject, expected_subject)
@override_settings(