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)