summaryrefslogtreecommitdiff
path: root/tests/queries
diff options
context:
space:
mode:
authorMariusz Felisiak <felisiak.mariusz@gmail.com>2021-03-10 09:16:28 +0100
committerGitHub <noreply@github.com>2021-03-10 09:16:28 +0100
commitba9a2b754452b542d3f472f0acce6f940911aced (patch)
tree3ef805503af0ff58dedba310ae18a0b1f14c8edd /tests/queries
parent6f5dbe9dbe45b23b3befe4f1cd2ea13b6049ab96 (diff)
downloaddjango-ba9a2b754452b542d3f472f0acce6f940911aced.tar.gz
Refs #32508 -- Raised TypeError instead of using "assert" on unsupported operations for sliced querysets.
Diffstat (limited to 'tests/queries')
-rw-r--r--tests/queries/tests.py15
1 files changed, 10 insertions, 5 deletions
diff --git a/tests/queries/tests.py b/tests/queries/tests.py
index 1cbe005fa8..b9b0a72686 100644
--- a/tests/queries/tests.py
+++ b/tests/queries/tests.py
@@ -700,7 +700,8 @@ class Queries1Tests(TestCase):
)
self.assertQuerysetEqual(q.reverse(), [])
q.query.low_mark = 1
- with self.assertRaisesMessage(AssertionError, 'Cannot change a query once a slice has been taken'):
+ msg = 'Cannot change a query once a slice has been taken.'
+ with self.assertRaisesMessage(TypeError, msg):
q.extra(select={'foo': "1"})
self.assertQuerysetEqual(q.defer('meal'), [])
self.assertQuerysetEqual(q.only('meal'), [])
@@ -2359,15 +2360,18 @@ class QuerySetSupportsPythonIdioms(TestCase):
)
def test_slicing_cannot_filter_queryset_once_sliced(self):
- with self.assertRaisesMessage(AssertionError, "Cannot filter a query once a slice has been taken."):
+ msg = 'Cannot filter a query once a slice has been taken.'
+ with self.assertRaisesMessage(TypeError, msg):
Article.objects.all()[0:5].filter(id=1)
def test_slicing_cannot_reorder_queryset_once_sliced(self):
- with self.assertRaisesMessage(AssertionError, "Cannot reorder a query once a slice has been taken."):
+ msg = 'Cannot reorder a query once a slice has been taken.'
+ with self.assertRaisesMessage(TypeError, msg):
Article.objects.all()[0:5].order_by('id')
def test_slicing_cannot_combine_queries_once_sliced(self):
- with self.assertRaisesMessage(AssertionError, "Cannot combine queries once a slice has been taken."):
+ msg = 'Cannot combine queries once a slice has been taken.'
+ with self.assertRaisesMessage(TypeError, msg):
Article.objects.all()[0:1] & Article.objects.all()[4:5]
def test_slicing_negative_indexing_not_supported_for_single_element(self):
@@ -2417,7 +2421,8 @@ class WeirdQuerysetSlicingTests(TestCase):
self.assertQuerysetEqual(Article.objects.all()[0:0], [])
self.assertQuerysetEqual(Article.objects.all()[0:0][:10], [])
self.assertEqual(Article.objects.all()[:0].count(), 0)
- with self.assertRaisesMessage(TypeError, 'Cannot reverse a query once a slice has been taken.'):
+ msg = 'Cannot change a query once a slice has been taken.'
+ with self.assertRaisesMessage(TypeError, msg):
Article.objects.all()[:0].latest('created')
def test_empty_resultset_sql(self):