From 34f8eeea4aaed37e1d02915b76c18892c8c1718e Mon Sep 17 00:00:00 2001
From: CruxBox <shubhambhagat111@yahoo.com>
Date: Mon, 10 Jun 2019 03:32:40 +0530
Subject: Fixed #30548 -- Improved exception when expression contains mixed
 types.

---
 tests/aggregation/tests.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'tests/aggregation')

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()
-- 
cgit v1.3