diff options
| author | Tim Graham <timograham@gmail.com> | 2015-10-30 11:02:00 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-10-30 11:30:08 -0400 |
| commit | 703369fb25ad0cc8db844127085a3ae76260dab3 (patch) | |
| tree | a7e2d2e79ba173d6f60be1161fc135c26cd39882 | |
| parent | 78f9805755c736573cb45f512345f064c88a680e (diff) | |
[1.9.x] Refs #24499 -- Removed an obsolete test check for PostGIS 1.5.
Backport of ab873e7a681e62d6803a3c04a051a47335f7b93a from master
| -rw-r--r-- | tests/gis_tests/geoapp/test_functions.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tests/gis_tests/geoapp/test_functions.py b/tests/gis_tests/geoapp/test_functions.py index bcd9a1ccc6..c9e3d1856d 100644 --- a/tests/gis_tests/geoapp/test_functions.py +++ b/tests/gis_tests/geoapp/test_functions.py @@ -246,10 +246,9 @@ class GISFunctionsTests(TestCase): qs = City.objects.filter(point__isnull=False).annotate(num_geom=functions.NumGeometries('point')) for city in qs: - # Oracle and PostGIS 2.0+ will return 1 for the number of - # geometries on non-collections, whereas PostGIS < 2.0.0 and MySQL - # will return None. - if (postgis and connection.ops.spatial_version < (2, 0, 0)) or mysql: + # Oracle and PostGIS return 1 for the number of geometries on + # non-collections, whereas MySQL returns None. + if mysql: self.assertIsNone(city.num_geom) else: self.assertEqual(1, city.num_geom) |
