mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-04 17:59:13 +00:00
Code Issues 32 Releases Wiki Activity

[1.2.X] Fixed result ordering assumptions in the select_related tests.

Browse Source 
Backport of r14762 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14763 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Ian Kelly 2010-12-01 21:44:37 +00:00
parent e86e303140
commit 1155b493bc
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tests/modeltests/select_related/tests.py
View File

@ -68,11 +68,11 @@ class SelectRelatedTests(TestCase):
"""
world = Species.objects.all()
families = [o.genus.family.name for o in world]
self.assertEqual(families, [
'Drosophilidae',
'Hominidae',
'Fabaceae',
self.assertEqual(sorted(families), [
'Amanitacae',
'Drosophilidae',
'Fabaceae',
'Hominidae',
])
self.assertEqual(len(db.connection.queries), 9)
@ -83,11 +83,11 @@ class SelectRelatedTests(TestCase):
"""
world = Species.objects.all().select_related()
families = [o.genus.family.name for o in world]
self.assertEqual(families, [
'Drosophilidae',
'Hominidae',
'Fabaceae',
self.assertEqual(sorted(families), [
'Amanitacae',
'Drosophilidae',
'Fabaceae',
'Hominidae',
])
self.assertEqual(len(db.connection.queries), 1)
@ -118,8 +118,8 @@ class SelectRelatedTests(TestCase):
"""
world = Species.objects.all().select_related(depth=2)
orders = [o.genus.family.order.name for o in world]
self.assertEqual(orders,
['Diptera', 'Primates', 'Fabales', 'Agaricales'])
self.assertEqual(sorted(orders),
['Agaricales', 'Diptera', 'Fabales', 'Primates'])
self.assertEqual(len(db.connection.queries), 5)
def test_select_related_with_extra(self):
@ -138,8 +138,8 @@ class SelectRelatedTests(TestCase):
"""
world = Species.objects.select_related('genus__family')
families = [o.genus.family.name for o in world]
self.assertEqual(families,
['Drosophilidae', 'Hominidae', 'Fabaceae', 'Amanitacae'])
self.assertEqual(sorted(families),
['Amanitacae', 'Drosophilidae', 'Fabaceae', 'Hominidae'])
self.assertEqual(len(db.connection.queries), 1)
def test_more_certain_fields(self):