summaryrefslogtreecommitdiff
path: root/tests/aggregation
diff options
context:
space:
mode:
authorLoic Bistuer <loic.bistuer@gmail.com>2015-01-21 12:47:49 +0700
committerLoic Bistuer <loic.bistuer@gmail.com>2015-01-22 08:02:07 +0700
commit0580133971e42c322a9c0b451d3bbf72eff2ca24 (patch)
treed2474f1cec8ce296b51acc3c5e6175c11f15b847 /tests/aggregation
parent45aaced91e4789c3a08b17f0908010923361dbec (diff)
[1.8.x] Fixed small inconsistency when handling aggregate's default_alias.
Refs #14030. Backport of d450af8a26 from master
Diffstat (limited to 'tests/aggregation')
-rw-r--r--tests/aggregation/tests.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/aggregation/tests.py b/tests/aggregation/tests.py
index ec19fcfd53..7e500dfb0e 100644
--- a/tests/aggregation/tests.py
+++ b/tests/aggregation/tests.py
@@ -768,10 +768,12 @@ class ComplexAggregateTestCase(TestCase):
self.assertEqual(b3.sums, Approximate(Decimal("383.69"), places=2))
def test_complex_aggregations_require_kwarg(self):
- with six.assertRaisesRegex(self, TypeError, 'Complex expressions require an alias'):
+ with six.assertRaisesRegex(self, TypeError, 'Complex annotations require an alias'):
Author.objects.annotate(Sum(F('age') + F('friends__age')))
with six.assertRaisesRegex(self, TypeError, 'Complex aggregates require an alias'):
Author.objects.aggregate(Sum('age') / Count('age'))
+ with six.assertRaisesRegex(self, TypeError, 'Complex aggregates require an alias'):
+ Author.objects.aggregate(Sum(Value(1)))
def test_aggregate_over_complex_annotation(self):
qs = Author.objects.annotate(