1
0
mirror of https://github.com/django/django.git synced 2025-08-21 01:09:13 +00:00

Refs #36282 -- Fixed PrefetchRelatedMTICacheTests test ordering expectations.

This commit is contained in:
Mariusz Felisiak 2025-08-05 10:13:00 +02:00 committed by GitHub
parent 9cec8d9f55
commit e664c5afa9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -2176,20 +2176,20 @@ class PrefetchRelatedMTICacheTests(TestCase):
.prefetch_related("favorite_authors") .prefetch_related("favorite_authors")
.get(pk=self.m2m_child.pk) .get(pk=self.m2m_child.pk)
) )
self.assertQuerySetEqual( self.assertCountEqual(
gp.favorite_authors.all(), gp.favorite_authors.all(),
{self.related1, self.related2, self.related3}, {self.related1, self.related2, self.related3},
) )
self.assertQuerySetEqual( self.assertCountEqual(
gp.authorwithage.favorite_authors.all(), gp.authorwithage.favorite_authors.all(),
{self.related1, self.related2, self.related3}, {self.related1, self.related2, self.related3},
) )
gp.authorwithage.favorite_authors.add(self.related4) gp.authorwithage.favorite_authors.add(self.related4)
self.assertQuerySetEqual( self.assertCountEqual(
gp.favorite_authors.all(), gp.favorite_authors.all(),
{self.related1, self.related2, self.related3, self.related4}, {self.related1, self.related2, self.related3, self.related4},
) )
self.assertQuerySetEqual( self.assertCountEqual(
gp.authorwithage.favorite_authors.all(), gp.authorwithage.favorite_authors.all(),
{self.related1, self.related2, self.related3, self.related4}, {self.related1, self.related2, self.related3, self.related4},
) )
@ -2202,28 +2202,28 @@ class PrefetchRelatedMTICacheTests(TestCase):
.prefetch_related("favorite_authors") .prefetch_related("favorite_authors")
.get(pk=self.m2m_child.pk) .get(pk=self.m2m_child.pk)
) )
self.assertQuerySetEqual( self.assertCountEqual(
gp.favorite_authors.all(), gp.favorite_authors.all(),
[self.related1, self.related2, self.related3], [self.related1, self.related2, self.related3],
) )
self.assertQuerySetEqual( self.assertCountEqual(
gp.authorwithage.favorite_authors.all(), gp.authorwithage.favorite_authors.all(),
[self.related1, self.related2, self.related3], [self.related1, self.related2, self.related3],
) )
self.assertQuerySetEqual( self.assertCountEqual(
gp.authorwithage.authorwithagechild.favorite_authors.all(), gp.authorwithage.authorwithagechild.favorite_authors.all(),
[self.related1, self.related2, self.related3], [self.related1, self.related2, self.related3],
) )
gp.authorwithage.authorwithagechild.favorite_authors.add(self.related4) gp.authorwithage.authorwithagechild.favorite_authors.add(self.related4)
self.assertQuerySetEqual( self.assertCountEqual(
gp.favorite_authors.all(), gp.favorite_authors.all(),
[self.related1, self.related2, self.related3, self.related4], [self.related1, self.related2, self.related3, self.related4],
) )
self.assertQuerySetEqual( self.assertCountEqual(
gp.authorwithage.favorite_authors.all(), gp.authorwithage.favorite_authors.all(),
[self.related1, self.related2, self.related3, self.related4], [self.related1, self.related2, self.related3, self.related4],
) )
self.assertQuerySetEqual( self.assertCountEqual(
gp.authorwithage.authorwithagechild.favorite_authors.all(), gp.authorwithage.authorwithagechild.favorite_authors.all(),
[self.related1, self.related2, self.related3, self.related4], [self.related1, self.related2, self.related3, self.related4],
) )
@ -2234,17 +2234,17 @@ class PrefetchRelatedMTICacheTests(TestCase):
.prefetch_related("favorite_authors") .prefetch_related("favorite_authors")
.get(pk=self.m2m_child.pk) .get(pk=self.m2m_child.pk)
) )
self.assertQuerySetEqual( self.assertCountEqual(
gp.favorite_authors.all(), gp.favorite_authors.all(),
[self.related1, self.related2, self.related3], [self.related1, self.related2, self.related3],
) )
self.assertQuerySetEqual( self.assertCountEqual(
gp.authorwithage.favorite_authors.all(), gp.authorwithage.favorite_authors.all(),
[self.related1, self.related2, self.related3], [self.related1, self.related2, self.related3],
) )
gp.authorwithage.favorite_authors.clear() gp.authorwithage.favorite_authors.clear()
self.assertQuerySetEqual(gp.favorite_authors.all(), []) self.assertSequenceEqual(gp.favorite_authors.all(), [])
self.assertQuerySetEqual(gp.authorwithage.favorite_authors.all(), []) self.assertSequenceEqual(gp.authorwithage.favorite_authors.all(), [])
def test_remove_clears_prefetched_objects_in_grandparent(self): def test_remove_clears_prefetched_objects_in_grandparent(self):
gp = ( gp = (
@ -2254,21 +2254,21 @@ class PrefetchRelatedMTICacheTests(TestCase):
.prefetch_related("favorite_authors") .prefetch_related("favorite_authors")
.get(pk=self.m2m_child.pk) .get(pk=self.m2m_child.pk)
) )
self.assertQuerySetEqual( self.assertCountEqual(
gp.favorite_authors.all(), gp.favorite_authors.all(),
[self.related1, self.related2, self.related3], [self.related1, self.related2, self.related3],
) )
self.assertQuerySetEqual( self.assertCountEqual(
gp.authorwithage.favorite_authors.all(), gp.authorwithage.favorite_authors.all(),
[self.related1, self.related2, self.related3], [self.related1, self.related2, self.related3],
) )
self.assertQuerySetEqual( self.assertCountEqual(
gp.authorwithage.authorwithagechild.favorite_authors.all(), gp.authorwithage.authorwithagechild.favorite_authors.all(),
[self.related1, self.related2, self.related3], [self.related1, self.related2, self.related3],
) )
gp.authorwithage.favorite_authors.clear() gp.authorwithage.favorite_authors.clear()
self.assertQuerySetEqual(gp.favorite_authors.all(), []) self.assertSequenceEqual(gp.favorite_authors.all(), [])
self.assertQuerySetEqual(gp.authorwithage.favorite_authors.all(), []) self.assertSequenceEqual(gp.authorwithage.favorite_authors.all(), [])
self.assertQuerySetEqual( self.assertSequenceEqual(
gp.authorwithage.authorwithagechild.favorite_authors.all(), [] gp.authorwithage.authorwithagechild.favorite_authors.all(), []
) )