From 344ae16e1e21ab7c0b594d755519738f7f16eaf1 Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Mon, 20 Oct 2025 16:03:39 +0200 Subject: [PATCH 1/2] Fixed RelatedGeoModelTest.test_related_union_aggregate() test on Oracle and GEOS 3.12+. --- tests/gis_tests/relatedapp/tests.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/tests/gis_tests/relatedapp/tests.py b/tests/gis_tests/relatedapp/tests.py index 34dc2bba15ed..8baf65be2728 100644 --- a/tests/gis_tests/relatedapp/tests.py +++ b/tests/gis_tests/relatedapp/tests.py @@ -100,10 +100,15 @@ def test_related_union_aggregate(self): self.assertEqual(type(u3), MultiPoint) # Ordering of points in the result of the union is not defined and - # implementation-dependent (DB backend, GEOS version) - self.assertEqual({p.ewkt for p in ref_u1}, {p.ewkt for p in u1}) - self.assertEqual({p.ewkt for p in ref_u2}, {p.ewkt for p in u2}) - self.assertEqual({p.ewkt for p in ref_u1}, {p.ewkt for p in u3}) + # implementation-dependent (DB backend, GEOS version). + tests = [ + (u1, ref_u1), + (u2, ref_u2), + (u3, ref_u1), + ] + for union, ref in tests: + for point, ref_point in zip(sorted(union), sorted(ref), strict=True): + self.assertIs(point.equals_exact(ref_point, tolerance=6), True) def test05_select_related_fk_to_subclass(self): """ From 5625bd590766e5ca8c2c76ba2307b98f7450ff83 Mon Sep 17 00:00:00 2001 From: Emmanuel Ferdman Date: Mon, 20 Oct 2025 20:52:02 +0300 Subject: [PATCH 2/2] Removed duplicate display_raw key in expected data in GeometryWidgetTests. Signed-off-by: Emmanuel Ferdman --- tests/gis_tests/test_geoforms.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/gis_tests/test_geoforms.py b/tests/gis_tests/test_geoforms.py index 753505fc68cf..4b229d889779 100644 --- a/tests/gis_tests/test_geoforms.py +++ b/tests/gis_tests/test_geoforms.py @@ -507,7 +507,6 @@ def test_subwidgets(self): "map_srid": 4326, "geom_name": "Geometry", "geom_type": "GEOMETRY", - "display_raw": False, }, "name": "name", "template_name": "",