From 729cd6a11a6f14b56bfc2551834b4e0892142b12 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Tue, 23 Sep 2014 19:51:14 -0400 Subject: [PATCH] Skipped a broken geoapp test on Oracle; refs #23504. --- django/contrib/gis/tests/geoapp/tests.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/django/contrib/gis/tests/geoapp/tests.py b/django/contrib/gis/tests/geoapp/tests.py index f4699aed8f3..122b4dcd4eb 100644 --- a/django/contrib/gis/tests/geoapp/tests.py +++ b/django/contrib/gis/tests/geoapp/tests.py @@ -6,7 +6,7 @@ import unittest from django.db import connection from django.contrib.gis import gdal from django.contrib.gis.geos import HAS_GEOS -from django.contrib.gis.tests.utils import oracle, postgis, spatialite +from django.contrib.gis.tests.utils import no_oracle, oracle, postgis, spatialite from django.test import TestCase, skipUnlessDBFeature from django.utils import six @@ -784,7 +784,11 @@ class GeoQuerySetTest(TestCase): self.assertAlmostEqual(c1[0] + xfac, c2[0], 5) self.assertAlmostEqual(c1[1] + yfac, c2[1], 5) + # TODO: Oracle can be made to pass if + # union1 = union2 = fromstr('POINT (-97.5211570000000023 34.4646419999999978)') + # but this seems unexpected and should be investigated to determine the cause. @skipUnlessDBFeature("has_unionagg_method") + @no_oracle def test_unionagg(self): "Testing the `unionagg` (aggregate union) GeoQuerySet method." tx = Country.objects.get(name='Texas').mpoly