From 9a5fe5b29fd431431a53da63ad8825d878ee5878 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Wed, 10 Sep 2014 13:30:04 -0400 Subject: [PATCH] Added ordering to prevent non-deterministic test failure; refs #23099. --- django/contrib/gis/tests/distapp/tests.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/django/contrib/gis/tests/distapp/tests.py b/django/contrib/gis/tests/distapp/tests.py index db63b94eab8..5f898e3ddab 100644 --- a/django/contrib/gis/tests/distapp/tests.py +++ b/django/contrib/gis/tests/distapp/tests.py @@ -117,13 +117,13 @@ class DistanceTest(TestCase): # Testing using different variations of parameters and using models # with different projected coordinate systems. - dist1 = SouthTexasCity.objects.distance(lagrange, field_name='point') - dist2 = SouthTexasCity.objects.distance(lagrange) # Using GEOSGeometry parameter + dist1 = SouthTexasCity.objects.distance(lagrange, field_name='point').order_by('id') + dist2 = SouthTexasCity.objects.distance(lagrange).order_by('id') # Using GEOSGeometry parameter if spatialite or oracle: dist_qs = [dist1, dist2] else: - dist3 = SouthTexasCityFt.objects.distance(lagrange.ewkt) # Using EWKT string parameter. - dist4 = SouthTexasCityFt.objects.distance(lagrange) + dist3 = SouthTexasCityFt.objects.distance(lagrange.ewkt).order_by('id') # Using EWKT string parameter. + dist4 = SouthTexasCityFt.objects.distance(lagrange).order_by('id') dist_qs = [dist1, dist2, dist3, dist4] # Original query done on PostGIS, have to adjust AlmostEqual tolerance