summaryrefslogtreecommitdiff
path: root/tests/prefetch_related
diff options
context:
space:
mode:
authorMariusz Felisiak <felisiak.mariusz@gmail.com>2023-01-12 19:13:22 +0100
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2023-01-17 11:49:15 +0100
commit139135627650ed6aaaf4c755b82c3bd43f2b8f51 (patch)
treeed3f536247cc3a6b4e658846964f4155b60dab72 /tests/prefetch_related
parentb119f4329c2a4878f1c72f4d25d193d080792f62 (diff)
downloaddjango-139135627650ed6aaaf4c755b82c3bd43f2b8f51.tar.gz
Refs #29984 -- Made QuerySet.iterator() without chunk_size raise ValueError after prefetch_related().
Per deprecation timeline.
Diffstat (limited to 'tests/prefetch_related')
-rw-r--r--tests/prefetch_related/tests.py24
1 files changed, 5 insertions, 19 deletions
diff --git a/tests/prefetch_related/tests.py b/tests/prefetch_related/tests.py
index c153c0d9ec..c8b9a9538b 100644
--- a/tests/prefetch_related/tests.py
+++ b/tests/prefetch_related/tests.py
@@ -12,8 +12,7 @@ from django.test import (
skipIfDBFeature,
skipUnlessDBFeature,
)
-from django.test.utils import CaptureQueriesContext, ignore_warnings
-from django.utils.deprecation import RemovedInDjango50Warning
+from django.test.utils import CaptureQueriesContext
from .models import (
Article,
@@ -385,25 +384,12 @@ class PrefetchRelatedTests(TestDataMixin, TestCase):
[self.author1, self.author1, self.author3, self.author4],
)
- @ignore_warnings(category=RemovedInDjango50Warning)
- def test_m2m_prefetching_iterator_without_chunks(self):
- # prefetch_related() is ignored.
- with self.assertNumQueries(5):
- authors = [
- b.authors.first()
- for b in Book.objects.prefetch_related("authors").iterator()
- ]
- self.assertEqual(
- authors,
- [self.author1, self.author1, self.author3, self.author4],
- )
-
- def test_m2m_prefetching_iterator_without_chunks_warning(self):
+ def test_m2m_prefetching_iterator_without_chunks_error(self):
msg = (
- "Using QuerySet.iterator() after prefetch_related() without "
- "specifying chunk_size is deprecated."
+ "chunk_size must be provided when using QuerySet.iterator() after "
+ "prefetch_related()."
)
- with self.assertWarnsMessage(RemovedInDjango50Warning, msg):
+ with self.assertRaisesMessage(ValueError, msg):
Book.objects.prefetch_related("authors").iterator()