diff options
| author | Tim Graham <timograham@gmail.com> | 2017-01-03 09:49:00 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-03 09:49:00 -0500 |
| commit | c04207cd386e97f57e34791806fd253731295e43 (patch) | |
| tree | 0b399df4cf35cb3e3e17760173bc884a34e261e0 /tests | |
| parent | fdb23096040edbd2ec886e4227143b19fe04247a (diff) | |
Replaced some GIS has_X_method skips with supports_X_aggr/has_X_function.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/gis_tests/distapp/tests.py | 2 | ||||
| -rw-r--r-- | tests/gis_tests/geoapp/tests.py | 2 | ||||
| -rw-r--r-- | tests/gis_tests/relatedapp/tests.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/gis_tests/distapp/tests.py b/tests/gis_tests/distapp/tests.py index 6060f00461..3079afb9d7 100644 --- a/tests/gis_tests/distapp/tests.py +++ b/tests/gis_tests/distapp/tests.py @@ -312,7 +312,7 @@ class DistanceTest(TestCase): # instead (we should get the same results b/c accuracy variance won't matter # in this test case). querysets = [qs1] - if connection.features.has_distance_spheroid_method: + if connection.features.has_DistanceSpheroid_function: gq3 = Q(point__distance_lte=(wollongong.point, d1, 'spheroid')) gq4 = Q(point__distance_gte=(wollongong.point, d2, 'spheroid')) qs2 = AustraliaCity.objects.exclude(name='Wollongong').filter(gq3 | gq4) diff --git a/tests/gis_tests/geoapp/tests.py b/tests/gis_tests/geoapp/tests.py index 3ec620dc8e..7c4e8b8dfb 100644 --- a/tests/gis_tests/geoapp/tests.py +++ b/tests/gis_tests/geoapp/tests.py @@ -864,7 +864,7 @@ class GeoQuerySetTest(TestCase): self.assertAlmostEqual(c1[0] + xfac, c2[0], 5) self.assertAlmostEqual(c1[1] + yfac, c2[1], 5) - @skipUnlessDBFeature("has_unionagg_method") + @skipUnlessDBFeature('supports_union_aggr') def test_unionagg(self): """ Testing the `Union` aggregate. diff --git a/tests/gis_tests/relatedapp/tests.py b/tests/gis_tests/relatedapp/tests.py index 46796e2c2b..3ca4d91dba 100644 --- a/tests/gis_tests/relatedapp/tests.py +++ b/tests/gis_tests/relatedapp/tests.py @@ -98,7 +98,7 @@ class RelatedGeoModelTest(TestCase): tol ) - @skipUnlessDBFeature("has_unionagg_method") + @skipUnlessDBFeature('supports_union_aggr') def test_related_union_aggregate(self): "Testing the `Union` aggregate on related geographic models." # This combines the Extent and Union aggregates into one query |