From 46b3e7dd8cc1792a40bb8b4d0c267f3d1ceef68c Mon Sep 17 00:00:00 2001 From: Jacob Walls Date: Thu, 2 Jan 2025 20:41:29 -0500 Subject: Fixed #36048 -- Preferred ValueError to NotSupportedError for composite pk sanity checks. These checks are not backend-dependent. --- tests/foreign_object/test_tuple_lookups.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'tests/foreign_object') diff --git a/tests/foreign_object/test_tuple_lookups.py b/tests/foreign_object/test_tuple_lookups.py index 797fea1c8a..42717c4f11 100644 --- a/tests/foreign_object/test_tuple_lookups.py +++ b/tests/foreign_object/test_tuple_lookups.py @@ -1,6 +1,5 @@ import itertools -from django.db import NotSupportedError from django.db.models import F from django.db.models.fields.tuple_lookups import ( TupleExact, @@ -65,7 +64,7 @@ class TupleLookupsTests(TestCase): def test_exact_subquery(self): with self.assertRaisesMessage( - NotSupportedError, "'exact' doesn't support multi-column subqueries." + ValueError, "'exact' doesn't support multi-column subqueries." ): subquery = Customer.objects.filter(id=self.customer_1.id)[:1] self.assertSequenceEqual( @@ -239,7 +238,7 @@ class TupleLookupsTests(TestCase): def test_lt_subquery(self): with self.assertRaisesMessage( - NotSupportedError, "'lt' doesn't support multi-column subqueries." + ValueError, "'lt' doesn't support multi-column subqueries." ): subquery = Customer.objects.filter(id=self.customer_1.id)[:1] self.assertSequenceEqual( @@ -287,7 +286,7 @@ class TupleLookupsTests(TestCase): def test_lte_subquery(self): with self.assertRaisesMessage( - NotSupportedError, "'lte' doesn't support multi-column subqueries." + ValueError, "'lte' doesn't support multi-column subqueries." ): subquery = Customer.objects.filter(id=self.customer_1.id)[:1] self.assertSequenceEqual( @@ -327,7 +326,7 @@ class TupleLookupsTests(TestCase): def test_gt_subquery(self): with self.assertRaisesMessage( - NotSupportedError, "'gt' doesn't support multi-column subqueries." + ValueError, "'gt' doesn't support multi-column subqueries." ): subquery = Customer.objects.filter(id=self.customer_1.id)[:1] self.assertSequenceEqual( @@ -375,7 +374,7 @@ class TupleLookupsTests(TestCase): def test_gte_subquery(self): with self.assertRaisesMessage( - NotSupportedError, "'gte' doesn't support multi-column subqueries." + ValueError, "'gte' doesn't support multi-column subqueries." ): subquery = Customer.objects.filter(id=self.customer_1.id)[:1] self.assertSequenceEqual( @@ -419,7 +418,7 @@ class TupleLookupsTests(TestCase): def test_isnull_subquery(self): with self.assertRaisesMessage( - NotSupportedError, "'isnull' doesn't support multi-column subqueries." + ValueError, "'isnull' doesn't support multi-column subqueries." ): subquery = Customer.objects.filter(id=0)[:1] self.assertSequenceEqual( -- cgit v1.3