From d7e4d6463c2fda11214e002ee6b3189f7b882f15 Mon Sep 17 00:00:00 2001 From: Sergey Fedoseev Date: Tue, 21 Jan 2020 21:18:11 +0500 Subject: [PATCH] [3.0.x] Fixed #31195 -- Relaxed GeometryDistance test for PROJ 5.2+. Backport of 31e2ab345b272b309770262067710589ec433e79 from master --- tests/gis_tests/geoapp/test_functions.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/gis_tests/geoapp/test_functions.py b/tests/gis_tests/geoapp/test_functions.py index aa356e30a2..fa59d363f9 100644 --- a/tests/gis_tests/geoapp/test_functions.py +++ b/tests/gis_tests/geoapp/test_functions.py @@ -246,7 +246,7 @@ class GISFunctionsTests(FuncTestMixin, TestCase): def test_geometry_distance(self): point = Point(-90, 40, srid=4326) qs = City.objects.annotate(distance=functions.GeometryDistance('point', point)).order_by('distance') - self.assertEqual([city.distance for city in qs], [ + distances = ( 2.99091995527296, 5.33507274054713, 9.33852187483721, @@ -255,7 +255,10 @@ class GISFunctionsTests(FuncTestMixin, TestCase): 14.713098433352, 34.3635252198568, 276.987855073372, - ]) + ) + for city, expected_distance in zip(qs, distances): + with self.subTest(city=city): + self.assertAlmostEqual(city.distance, expected_distance) @skipUnlessDBFeature("has_Intersection_function") def test_intersection(self):