diff options
| author | Marc Tamlyn <marc.tamlyn@gmail.com> | 2013-05-21 02:51:14 -0700 |
|---|---|---|
| committer | Marc Tamlyn <marc.tamlyn@gmail.com> | 2013-05-21 02:51:14 -0700 |
| commit | b632baac3c56101d59f6279767e5f3418643e425 (patch) | |
| tree | e47a80f8ea9f65a992db8ed589d47158a7adfa31 /tests/basic | |
| parent | 60585f6621563627220eeb5bbac993b92d76a704 (diff) | |
| parent | 09f865276554f35060ff939722ec4cefd578edf6 (diff) | |
Merge pull request #1192 from mjtamlyn/assertIsInstance
Use assertIsInstance in test code.
Diffstat (limited to 'tests/basic')
| -rw-r--r-- | tests/basic/tests.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/basic/tests.py b/tests/basic/tests.py index 95feac0deb..6bf46cce9b 100644 --- a/tests/basic/tests.py +++ b/tests/basic/tests.py @@ -432,7 +432,7 @@ class ModelTest(TestCase): Article.objects.all()[0:-5] except Exception as e: error = e - self.assertTrue(isinstance(error, AssertionError)) + self.assertIsInstance(error, AssertionError) self.assertEqual(str(error), "Negative indexing is not supported.") # An Article instance doesn't have access to the "objects" attribute. @@ -637,15 +637,15 @@ class ModelTest(TestCase): # Can't be instantiated with self.assertRaises(TypeError): EmptyQuerySet() - self.assertTrue(isinstance(Article.objects.none(), EmptyQuerySet)) + self.assertIsInstance(Article.objects.none(), EmptyQuerySet) def test_emptyqs_values(self): # test for #15959 Article.objects.create(headline='foo', pub_date=datetime.now()) with self.assertNumQueries(0): qs = Article.objects.none().values_list('pk') - self.assertTrue(isinstance(qs, EmptyQuerySet)) - self.assertTrue(isinstance(qs, ValuesListQuerySet)) + self.assertIsInstance(qs, EmptyQuerySet) + self.assertIsInstance(qs, ValuesListQuerySet) self.assertEqual(len(qs), 0) def test_emptyqs_customqs(self): @@ -660,7 +660,7 @@ class ModelTest(TestCase): qs = qs.none() with self.assertNumQueries(0): self.assertEqual(len(qs), 0) - self.assertTrue(isinstance(qs, EmptyQuerySet)) + self.assertIsInstance(qs, EmptyQuerySet) self.assertEqual(qs.do_something(), 'did something') def test_emptyqs_values_order(self): |