Skip to content

Commit

Permalink
[1.5.X] Fixed an order dependant test failure.
Browse files Browse the repository at this point in the history
Backport of 7e97f4f from master.
  • Loading branch information
apollo13 committed Dec 11, 2012
1 parent 919fbe0 commit deb205b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions tests/regressiontests/queries/tests.py
Expand Up @@ -1028,12 +1028,12 @@ def setUp(self):
def test_ticket14876(self):
q1 = Report.objects.filter(Q(creator__isnull=True) | Q(creator__extra__info='e1'))
q2 = Report.objects.filter(Q(creator__isnull=True)) | Report.objects.filter(Q(creator__extra__info='e1'))
self.assertQuerysetEqual(q1, ["<Report: r1>", "<Report: r3>"])
self.assertQuerysetEqual(q1, ["<Report: r1>", "<Report: r3>"], ordered=False)
self.assertEqual(str(q1.query), str(q2.query))

q1 = Report.objects.filter(Q(creator__extra__info='e1') | Q(creator__isnull=True))
q2 = Report.objects.filter(Q(creator__extra__info='e1')) | Report.objects.filter(Q(creator__isnull=True))
self.assertQuerysetEqual(q1, ["<Report: r1>", "<Report: r3>"])
self.assertQuerysetEqual(q1, ["<Report: r1>", "<Report: r3>"], ordered=False)
self.assertEqual(str(q1.query), str(q2.query))

q1 = Item.objects.filter(Q(creator=self.a1) | Q(creator__report__name='r1')).order_by()
Expand Down

0 comments on commit deb205b

Please sign in to comment.