From aeddab3fc7c92befa491a95f97eff2830ae96841 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Mon, 17 Jan 2011 02:40:16 +0000 Subject: [PATCH] [1.2.X] Corrected an aggregation test failure under PostgreSQL, introduced by r15223. Thanks to Alex for the report. Backport of r15230 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15231 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- tests/regressiontests/aggregation_regress/tests.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/regressiontests/aggregation_regress/tests.py b/tests/regressiontests/aggregation_regress/tests.py index 821412e409..822785b7a5 100644 --- a/tests/regressiontests/aggregation_regress/tests.py +++ b/tests/regressiontests/aggregation_regress/tests.py @@ -500,19 +500,19 @@ class AggregationTests(TestCase): # age is a field on Author, so it shouldn't be allowed as an aggregate. # But age isn't included in the ValuesQuerySet, so it is. - results = Author.objects.values('name').annotate(age=Count('book_contact_set')) + results = Author.objects.values('name').annotate(age=Count('book_contact_set')).order_by('name') self.assertEquals(len(results), 9) self.assertEquals(results[0]['name'], u'Adrian Holovaty') self.assertEquals(results[0]['age'], 1) # Same problem, but aggregating over m2m fields - results = Author.objects.values('name').annotate(age=Avg('friends__age')) + results = Author.objects.values('name').annotate(age=Avg('friends__age')).order_by('name') self.assertEquals(len(results), 9) self.assertEquals(results[0]['name'], u'Adrian Holovaty') self.assertEquals(results[0]['age'], 32.0) # Same problem, but colliding with an m2m field - results = Author.objects.values('name').annotate(friends=Count('friends')) + results = Author.objects.values('name').annotate(friends=Count('friends')).order_by('name') self.assertEquals(len(results), 9) self.assertEquals(results[0]['name'], u'Adrian Holovaty') self.assertEquals(results[0]['friends'], 2)