Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Partial revert of commit 2bf403e

Homework: write 100 times geoapp is not geogapp.
  • Loading branch information...
commit 57815e263055842aba56b633ecc7e7ef814dff1f 1 parent ef3fddf
Claude Paroz claudep authored
Showing with 4 additions and 4 deletions.
  1. +4 −4 django/contrib/gis/tests/geoapp/tests.py
8 django/contrib/gis/tests/geoapp/tests.py
View
@@ -8,7 +8,7 @@
from django.contrib.gis import gdal
from django.contrib.gis.geos import HAS_GEOS
from django.contrib.gis.tests.utils import (
- no_mysql, no_oracle, no_spatialite,
+ HAS_SPATIAL_DB, no_mysql, no_oracle, no_spatialite,
mysql, oracle, postgis, spatialite)
from django.test import TestCase
from django.utils import six
@@ -28,7 +28,7 @@ def postgis_bug_version():
return spatial_version and (2, 0, 0) <= spatial_version <= (2, 0, 1)
-@skipUnless(HAS_GEOS and postgis, "Geos and postgis are required.")
+@skipUnless(HAS_GEOS and HAS_SPATIAL_DB, "Geos and spatial db are required.")
class GeoModelTest(TestCase):
def test_fixtures(self):
@@ -203,7 +203,7 @@ def test_raw_sql_query(self):
self.assertTrue(isinstance(cities2[0].point, Point))
-@skipUnless(HAS_GEOS and postgis, "Geos and postgis are required.")
+@skipUnless(HAS_GEOS and HAS_SPATIAL_DB, "Geos and spatial db are required.")
class GeoLookupTest(TestCase):
@no_mysql
@@ -389,7 +389,7 @@ def test_relate_lookup(self):
self.assertEqual('Lawrence', City.objects.get(point__relate=(ks.poly, intersects_mask)).name)
-@skipUnless(HAS_GEOS and postgis, "Geos and postgis are required.")
+@skipUnless(HAS_GEOS and HAS_SPATIAL_DB, "Geos and spatial db are required.")
class GeoQuerySetTest(TestCase):
# Please keep the tests in GeoQuerySet method's alphabetic order
Please sign in to comment.
Something went wrong with that request. Please try again.