summaryrefslogtreecommitdiff
path: root/tests/foreign_object
diff options
context:
space:
mode:
authorMads Jensen <mje@inducks.org>2016-09-10 11:36:27 +0200
committerTim Graham <timograham@gmail.com>2016-09-13 10:07:37 -0400
commit0c1f71635f8a3f32195e1573fe929c7d88a78511 (patch)
tree4d8127fde3634dfd3d4ad8451cee140d34070821 /tests/foreign_object
parent8b050cf9dcad3db39cc9ef44906bfc39f5aa3d25 (diff)
downloaddjango-0c1f71635f8a3f32195e1573fe929c7d88a78511.tar.gz
Fixed #27203 -- Replaced assertQuerysetEqual(..., lambda o: o) with assertSequenceEqual().
Diffstat (limited to 'tests/foreign_object')
-rw-r--r--tests/foreign_object/tests.py30
1 files changed, 18 insertions, 12 deletions
diff --git a/tests/foreign_object/tests.py b/tests/foreign_object/tests.py
index a622dfe497..93df8d6cc1 100644
--- a/tests/foreign_object/tests.py
+++ b/tests/foreign_object/tests.py
@@ -153,16 +153,22 @@ class MultiColumnFKTests(TestCase):
group_id=self.cia.id)
Friendship.objects.create(from_friend_country_id=self.usa.id, from_friend_id=self.bob.id,
to_friend_country_id=self.usa.id, to_friend_id=self.jim.id)
- self.assertQuerysetEqual(Membership.objects.filter(
- person__in=Person.objects.filter(
- from_friend__in=Friendship.objects.filter(
- to_friend__in=Person.objects.all()))),
- [m1], lambda x: x)
- self.assertQuerysetEqual(Membership.objects.exclude(
- person__in=Person.objects.filter(
- from_friend__in=Friendship.objects.filter(
- to_friend__in=Person.objects.all()))),
- [m2], lambda x: x)
+ self.assertSequenceEqual(
+ Membership.objects.filter(
+ person__in=Person.objects.filter(
+ from_friend__in=Friendship.objects.filter(to_friend__in=Person.objects.all())
+ )
+ ),
+ [m1]
+ )
+ self.assertSequenceEqual(
+ Membership.objects.exclude(
+ person__in=Person.objects.filter(
+ from_friend__in=Friendship.objects.filter(to_friend__in=Person.objects.all())
+ )
+ ),
+ [m2]
+ )
def test_select_related_foreignkey_forward_works(self):
Membership.objects.create(membership_country=self.usa, person=self.bob, group=self.cia)
@@ -380,9 +386,9 @@ class MultiColumnFKTests(TestCase):
na = NewsArticle.objects.create(pub_date=datetime.date.today())
ArticleTranslation.objects.create(
article=na, lang="fi", title="foo", body="bar")
- self.assertQuerysetEqual(
+ self.assertSequenceEqual(
NewsArticle.objects.select_related('active_translation'),
- [na], lambda x: x
+ [na]
)
with self.assertNumQueries(1):
self.assertEqual(