From 0cf527f77cb546d2b0e8594110acf0ce433a2d4d Mon Sep 17 00:00:00 2001 From: Ian Kelly Date: Wed, 9 Mar 2011 19:20:35 +0000 Subject: [PATCH] Fixed a test that was failing in Oracle due to default ordering assumptions. git-svn-id: http://code.djangoproject.com/svn/django/trunk@15783 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- .../aggregation_regress/tests.py | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/regressiontests/aggregation_regress/tests.py b/tests/regressiontests/aggregation_regress/tests.py index 97e3549767..0bb68991ea 100644 --- a/tests/regressiontests/aggregation_regress/tests.py +++ b/tests/regressiontests/aggregation_regress/tests.py @@ -568,12 +568,12 @@ class AggregationTests(TestCase): ) publishers = Publisher.objects.filter(id__in=[1, 2]) - self.assertQuerysetEqual( - publishers, [ + self.assertEqual( + sorted(p.name for p in publishers), + [ "Apress", "Sams" - ], - lambda p: p.name + ] ) publishers = publishers.annotate(n_books=Count("book")) @@ -582,12 +582,12 @@ class AggregationTests(TestCase): 2 ) - self.assertQuerysetEqual( - publishers, [ + self.assertEqual( + sorted(p.name for p in publishers), + [ "Apress", - "Sams", - ], - lambda p: p.name + "Sams" + ] ) books = Book.objects.filter(publisher__in=publishers) @@ -599,12 +599,12 @@ class AggregationTests(TestCase): ], lambda b: b.name ) - self.assertQuerysetEqual( - publishers, [ + self.assertEqual( + sorted(p.name for p in publishers), + [ "Apress", - "Sams", - ], - lambda p: p.name + "Sams" + ] ) # Regression for 10666 - inherited fields work with annotations and