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

Skip GeometryFieldTest if there's no spacial database.

This commit is contained in:
Julien Phalip 2012-06-16 13:57:33 -07:00
parent 5bdd0d6b6a
commit 1794e36fa1
3 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
django/contrib/gis/gdal/__init__.py
View File

@ -44,6 +44,18 @@ try:
except:
HAS_GDAL, GEOJSON = False, False
from django.contrib.gis.tests.utils import no_mysql, oracle, postgis, spatialite
HAS_SPATIALREFSYS = True
if oracle:
from django.contrib.gis.db.backends.oracle.models import SpatialRefSys
elif postgis:
from django.contrib.gis.db.backends.postgis.models import SpatialRefSys
elif spatialite:
from django.contrib.gis.db.backends.spatialite.models import SpatialRefSys
else:
HAS_SPATIALREFSYS = False
SpatialRefSys = None
try:
from django.contrib.gis.gdal.envelope import Envelope
except ImportError:

10
django/contrib/gis/tests/test_geoforms.py
View File

@ -1,11 +1,13 @@
from django.forms import ValidationError
from django.contrib.gis import forms
from django.contrib.gis.gdal import HAS_GDAL
from django.contrib.gis.geos import GEOSGeometry
from django.contrib.gis.gdal import HAS_GDAL, HAS_SPATIALREFSYS
from django.utils import unittest
@unittest.skipUnless(HAS_GDAL, "GeometryFieldTest needs gdal support")
if HAS_SPATIALREFSYS:
from django.contrib.gis import forms
from django.contrib.gis.geos import GEOSGeometry
@unittest.skipUnless(HAS_GDAL and HAS_SPATIALREFSYS, "GeometryFieldTest needs gdal support and a spatial database")
class GeometryFieldTest(unittest.TestCase):
def test00_init(self):

12
django/contrib/gis/tests/test_spatialrefsys.py
View File

@ -1,5 +1,5 @@
from django.db import connection
from django.contrib.gis.gdal import HAS_GDAL
from django.contrib.gis.gdal import HAS_GDAL, HAS_SPATIALREFSYS, SpatialRefSys
from django.contrib.gis.tests.utils import no_mysql, oracle, postgis, spatialite
from django.utils import unittest
@ -28,16 +28,6 @@ test_srs = ({'srid' : 4326,
},
)
HAS_SPATIALREFSYS = True
if oracle:
from django.contrib.gis.db.backends.oracle.models import SpatialRefSys
elif postgis:
from django.contrib.gis.db.backends.postgis.models import SpatialRefSys
elif spatialite:
from django.contrib.gis.db.backends.spatialite.models import SpatialRefSys
else:
HAS_SPATIALREFSYS = False
@unittest.skipUnless(HAS_GDAL and HAS_SPATIALREFSYS,
"SpatialRefSysTest needs gdal support and a spatial database")
class SpatialRefSysTest(unittest.TestCase):