Author: kmtracey
Date: 2010-09-10 12:08:14 -0500 (Fri, 10 Sep 2010)
New Revision: 13710
Modified:
django/branches/releases/1.2.X/
django/branches/releases/1.2.X/tests/regressiontests/aggregation_regress/tests.py
Log:
[1.2.X] Fixed some of the problems with aggregation_regress tests on higher
levles of Postgres. Refs #14246.
r13709 from trunk.
Property changes on: django/branches/releases/1.2.X
___________________________________________________________________
Name: svnmerge-integrated
-
/django/trunk:1-13360,13434,13480,13574,13600,13638,13652,13664,13666,13668,13680,13683,13685,13687-13688,13690,13694,13696,13701-13702,13705
+
/django/trunk:1-13360,13434,13480,13574,13600,13638,13652,13664,13666,13668,13680,13683,13685,13687-13688,13690,13694,13696,13701-13702,13705,13709
Modified:
django/branches/releases/1.2.X/tests/regressiontests/aggregation_regress/tests.py
===================================================================
---
django/branches/releases/1.2.X/tests/regressiontests/aggregation_regress/tests.py
2010-09-10 17:04:28 UTC (rev 13709)
+++
django/branches/releases/1.2.X/tests/regressiontests/aggregation_regress/tests.py
2010-09-10 17:08:14 UTC (rev 13710)
@@ -5,7 +5,7 @@
from django.conf import settings
from django.test import TestCase, Approximate
from django.db import DEFAULT_DB_ALIAS
-from django.db.models import Count, Max, Avg, Sum, F
+from django.db.models import Count, Max, Avg, Sum, StdDev, Variance, F
from regressiontests.aggregation_regress.models import *
@@ -623,60 +623,60 @@
def test_stddev(self):
self.assertEqual(
Book.objects.aggregate(StdDev('pages')),
- {'pages__stddev': 311.46}
+ {'pages__stddev': Approximate(311.46, 1)}
)
self.assertEqual(
Book.objects.aggregate(StdDev('rating')),
- {'rating__stddev': 0.60}
+ {'rating__stddev': Approximate(0.60, 1)}
)
self.assertEqual(
Book.objects.aggregate(StdDev('price')),
- {'price__stddev': 24.16}
+ {'price__stddev': Approximate(24.16, 2)}
)
self.assertEqual(
Book.objects.aggregate(StdDev('pages', sample=True)),
- {'pages__stddev': 341.19}
+ {'pages__stddev': Approximate(341.19, 2)}
)
self.assertEqual(
Book.objects.aggregate(StdDev('rating', sample=True)),
- {'rating__stddev': 0.66}
+ {'rating__stddev': Approximate(0.66, 2)}
)
self.assertEqual(
Book.objects.aggregate(StdDev('price', sample=True)),
- {'price__stddev': 26.46}
+ {'price__stddev': Approximate(26.46, 1)}
)
self.assertEqual(
Book.objects.aggregate(Variance('pages')),
- {'pages__variance': 97010.80}
+ {'pages__variance': Approximate(97010.80, 1)}
)
self.assertEqual(
Book.objects.aggregate(Variance('rating')),
- {'rating__variance': 0.36}
+ {'rating__variance': Approximate(0.36, 1)}
)
self.assertEqual(
Book.objects.aggregate(Variance('price')),
- {'price__variance': 583.77}
+ {'price__variance': Approximate(583.77, 1)}
)
self.assertEqual(
Book.objects.aggregate(Variance('pages', sample=True)),
- {'pages__variance': 116412.96}
+ {'pages__variance': Approximate(116412.96, 1)}
)
self.assertEqual(
Book.objects.aggregate(Variance('rating', sample=True)),
- {'rating__variance': 0.44}
+ {'rating__variance': Approximate(0.44, 2)}
)
self.assertEqual(
Book.objects.aggregate(Variance('price', sample=True)),
- {'price__variance': 700.53}
+ {'price__variance': Approximate(700.53, 2)}
)
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
