Refs #32508 -- Raised Type/ValueError instead of using "assert" in django.db.models.

Co-authored-by: Mariusz Felisiak <felisiak.mariusz@gmail.com>

1 files changed, 7 insertions, 2 deletions

diff --git a/tests/distinct_on_fields/tests.py b/tests/distinct_on_fields/tests.py
index f87a3affb3..5404c3eb41 100644
--- a/tests/distinct_on_fields/tests.py
+++ b/tests/distinct_on_fields/tests.py
@@ -87,9 +87,14 @@ class DistinctOnTests(TestCase):
             self.assertSequenceEqual(qset, expected)
             self.assertEqual(qset.count(), len(expected))
 
-        # Combining queries with different distinct_fields is not allowed.
+        # Combining queries with non-unique query is not allowed.
         base_qs = Celebrity.objects.all()
-        with self.assertRaisesMessage(AssertionError, "Cannot combine queries with different distinct fields."):
+        msg = 'Cannot combine a unique query with a non-unique query.'
+        with self.assertRaisesMessage(TypeError, msg):
+            base_qs.distinct('id') & base_qs
+        # Combining queries with different distinct_fields is not allowed.
+        msg = 'Cannot combine queries with different distinct fields.'
+        with self.assertRaisesMessage(TypeError, msg):
             base_qs.distinct('id') & base_qs.distinct('name')
 
         # Test join unreffing