diff options
| author | Ian Kelly <ian.g.kelly@gmail.com> | 2010-12-01 21:44:37 +0000 |
|---|---|---|
| committer | Ian Kelly <ian.g.kelly@gmail.com> | 2010-12-01 21:44:37 +0000 |
| commit | 1155b493bc37ea37a31ff2a0da2be253504a59f8 (patch) | |
| tree | 3a4baf6690e90345d65005375d53221818c8fd84 /tests | |
| parent | e86e3031403bccb1fa6d7e4706155a29d4e22407 (diff) | |
[1.2.X] Fixed result ordering assumptions in the select_related tests.
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
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/modeltests/select_related/tests.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/modeltests/select_related/tests.py b/tests/modeltests/select_related/tests.py index a2111026cd..72b3ab25e9 100644 --- a/tests/modeltests/select_related/tests.py +++ b/tests/modeltests/select_related/tests.py @@ -68,11 +68,11 @@ class SelectRelatedTests(TestCase): """ world = Species.objects.all() families = [o.genus.family.name for o in world] - self.assertEqual(families, [ + self.assertEqual(sorted(families), [ + 'Amanitacae', 'Drosophilidae', - 'Hominidae', 'Fabaceae', - 'Amanitacae', + '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, [ + self.assertEqual(sorted(families), [ + 'Amanitacae', 'Drosophilidae', - 'Hominidae', 'Fabaceae', - 'Amanitacae', + '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): |
