summaryrefslogtreecommitdiff
path: root/tests/model_fields/tests.py
diff options
context:
space:
mode:
authorJon Dufresne <jon.dufresne@gmail.com>2016-06-16 11:19:18 -0700
committerTim Graham <timograham@gmail.com>2016-06-16 14:21:14 -0400
commit13d60298ea2a07242dc3952a9dfcd9c8857bf1f9 (patch)
tree230d0f843401781e9b2062fe3c1f929655a5527e /tests/model_fields/tests.py
parent70b7d6b4ea0cbd67406d193f0a7fed7e290d1eb6 (diff)
[1.10.x] Fixed #26747 -- Used more specific assertions in the Django test suite.
Backport of 4f336f66523001b009ab038b10848508fd208b3b from master
Diffstat (limited to 'tests/model_fields/tests.py')
-rw-r--r--tests/model_fields/tests.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/model_fields/tests.py b/tests/model_fields/tests.py
index 7b2e8f3aa7..85e2825165 100644
--- a/tests/model_fields/tests.py
+++ b/tests/model_fields/tests.py
@@ -70,7 +70,7 @@ class ChoicesTests(SimpleTestCase):
self.assertEqual(Whiz(c=1).get_c_display(), 'First') # A nested value
self.assertEqual(Whiz(c=0).get_c_display(), 'Other') # A top level value
self.assertEqual(Whiz(c=9).get_c_display(), 9) # Invalid value
- self.assertEqual(Whiz(c=None).get_c_display(), None) # Blank value
+ self.assertIsNone(Whiz(c=None).get_c_display()) # Blank value
self.assertEqual(Whiz(c='').get_c_display(), '') # Empty value
def test_iterator_choices(self):
@@ -79,7 +79,7 @@ class ChoicesTests(SimpleTestCase):
"""
self.assertEqual(WhizIter(c=1).c, 1) # A nested value
self.assertEqual(WhizIter(c=9).c, 9) # Invalid value
- self.assertEqual(WhizIter(c=None).c, None) # Blank value
+ self.assertIsNone(WhizIter(c=None).c) # Blank value
self.assertEqual(WhizIter(c='').c, '') # Empty value
def test_empty_iterator_choices(self):
@@ -88,5 +88,5 @@ class ChoicesTests(SimpleTestCase):
"""
self.assertEqual(WhizIterEmpty(c="a").c, "a") # A nested value
self.assertEqual(WhizIterEmpty(c="b").c, "b") # Invalid value
- self.assertEqual(WhizIterEmpty(c=None).c, None) # Blank value
+ self.assertIsNone(WhizIterEmpty(c=None).c) # Blank value
self.assertEqual(WhizIterEmpty(c='').c, '') # Empty value