summaryrefslogtreecommitdiff
path: root/tests/modeltests/raw_query
diff options
context:
space:
mode:
Diffstat (limited to 'tests/modeltests/raw_query')
-rw-r--r--tests/modeltests/raw_query/tests.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/modeltests/raw_query/tests.py b/tests/modeltests/raw_query/tests.py
index e7cadfae8c..5334412680 100644
--- a/tests/modeltests/raw_query/tests.py
+++ b/tests/modeltests/raw_query/tests.py
@@ -30,10 +30,10 @@ class RawQueryTests(TestCase):
for field in model._meta.fields:
# Check that all values on the model are equal
- self.assertEquals(getattr(item,field.attname),
+ self.assertEqual(getattr(item,field.attname),
getattr(orig_item,field.attname))
# This includes checking that they are the same type
- self.assertEquals(type(getattr(item,field.attname)),
+ self.assertEqual(type(getattr(item,field.attname)),
type(getattr(orig_item,field.attname)))
def assertNoAnnotations(self, results):
@@ -67,9 +67,9 @@ class RawQueryTests(TestCase):
iterated over.
"""
q = Author.objects.raw('SELECT * FROM raw_query_author')
- self.assert_(q.query.cursor is None)
+ self.assertTrue(q.query.cursor is None)
list(q)
- self.assert_(q.query.cursor is not None)
+ self.assertTrue(q.query.cursor is not None)
def testFkeyRawQuery(self):
"""
@@ -204,7 +204,7 @@ class RawQueryTests(TestCase):
self.assertEqual(third_author.first_name, 'Bob')
first_two = Author.objects.raw(query)[0:2]
- self.assertEquals(len(first_two), 2)
+ self.assertEqual(len(first_two), 2)
self.assertRaises(TypeError, lambda: Author.objects.raw(query)['test'])