p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[1.9.x] Refs #24499 -- Removed an obsolete test check for PostGIS 1.5. 

Backport of ab873e7a68 from master
This commit is contained in:
Tim Graham 2015-10-30 11:02:00 -04:00
parent 78f9805755
commit 703369fb25
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/gis_tests/geoapp/test_functions.py
View File

@ -246,10 +246,9 @@ class GISFunctionsTests(TestCase):
qs = City.objects.filter(point__isnull=False).annotate(num_geom=functions.NumGeometries('point')) qs = City.objects.filter(point__isnull=False).annotate(num_geom=functions.NumGeometries('point'))
for city in qs: for city in qs:
# Oracle and PostGIS 2.0+ will return 1 for the number of # Oracle and PostGIS return 1 for the number of geometries on
# geometries on non-collections, whereas PostGIS < 2.0.0 and MySQL # non-collections, whereas MySQL returns None.
# will return None. if mysql:
if (postgis and connection.ops.spatial_version < (2, 0, 0)) or mysql:
self.assertIsNone(city.num_geom) self.assertIsNone(city.num_geom)
else: else:
self.assertEqual(1, city.num_geom) self.assertEqual(1, city.num_geom)