summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorCruxBox <shubhambhagat111@yahoo.com>2019-06-10 03:32:40 +0530
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2019-06-10 19:48:53 +0200
commit34f8eeea4aaed37e1d02915b76c18892c8c1718e (patch)
tree7d07bce49be3aee9f1e3e8ae5e8bfeea88dd4add /tests
parent03cd3d137e2c29484b020b9768a4741f1096be97 (diff)
Fixed #30548 -- Improved exception when expression contains mixed types.
Diffstat (limited to 'tests')
-rw-r--r--tests/aggregation/tests.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/aggregation/tests.py b/tests/aggregation/tests.py
index a336758f45..bd6ecf699c 100644
--- a/tests/aggregation/tests.py
+++ b/tests/aggregation/tests.py
@@ -884,7 +884,10 @@ class AggregateTestCase(TestCase):
self.assertEqual(p2, {'avg_price': Approximate(Decimal('53.39'), places=2)})
def test_combine_different_types(self):
- msg = 'Expression contains mixed types. You must set output_field.'
+ msg = (
+ 'Expression contains mixed types: FloatField, IntegerField. '
+ 'You must set output_field.'
+ )
qs = Book.objects.annotate(sums=Sum('rating') + Sum('pages') + Sum('price'))
with self.assertRaisesMessage(FieldError, msg):
qs.first()