diff options
| author | Tim Graham <timograham@gmail.com> | 2014-09-17 15:33:50 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-09-17 15:33:50 -0400 |
| commit | 7fce7f51eff58b86b97cb797546da57096c0a786 (patch) | |
| tree | bda3c8dde705ac7caa749fc21c88014d753f8cc3 | |
| parent | fc2b8ddcc8a0d68dcd333a77314c816469ba96af (diff) | |
Skipped some broken tests on Oracle GIS; refs #23504.
| -rw-r--r-- | django/contrib/gis/tests/geoapp/test_regress.py | 5 | ||||
| -rw-r--r-- | django/contrib/gis/tests/relatedapp/tests.py | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/django/contrib/gis/tests/geoapp/test_regress.py b/django/contrib/gis/tests/geoapp/test_regress.py index c1a17326a2..e0a7dd9d73 100644 --- a/django/contrib/gis/tests/geoapp/test_regress.py +++ b/django/contrib/gis/tests/geoapp/test_regress.py @@ -5,6 +5,7 @@ from datetime import datetime from django.contrib.gis.geos import HAS_GEOS from django.contrib.gis.shortcuts import render_to_kmz +from django.contrib.gis.tests.utils import no_oracle from django.db.models import Count, Min from django.test import TestCase, skipUnlessDBFeature @@ -65,6 +66,10 @@ class GeoRegressionTests(TestCase): # .count() should not throw TypeError in __eq__ self.assertEqual(cities_within_state.count(), 1) + # TODO: fix on Oracle -- get the following error because the SQL is ordered + # by a geometry object, which Oracle apparently doesn't like: + # ORA-22901: cannot compare nested table or VARRAY or LOB attributes of an object type + @no_oracle def test_defer_or_only_with_annotate(self): "Regression for #16409. Make sure defer() and only() work with annotate()" self.assertIsInstance(list(City.objects.annotate(Count('point')).defer('name')), list) diff --git a/django/contrib/gis/tests/relatedapp/tests.py b/django/contrib/gis/tests/relatedapp/tests.py index e7d953f5a7..e98d637b69 100644 --- a/django/contrib/gis/tests/relatedapp/tests.py +++ b/django/contrib/gis/tests/relatedapp/tests.py @@ -263,6 +263,10 @@ class RelatedGeoModelTest(TestCase): self.assertEqual(1, len(vqs)) self.assertEqual(3, vqs[0]['num_books']) + # TODO: fix on Oracle -- get the following error because the SQL is ordered + # by a geometry object, which Oracle apparently doesn't like: + # ORA-22901: cannot compare nested table or VARRAY or LOB attributes of an object type + @no_oracle def test13c_count(self): "Testing `Count` aggregate with `.values()`. See #15305." qs = Location.objects.filter(id=5).annotate(num_cities=Count('city')).values('id', 'point', 'num_cities') |