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

Pushed GDAL skip condition inside test 

As GDAL_VERSION is conditionnaly imported, it cannot be referenced
in skipIf decorator.
This commit is contained in:
Claude Paroz 2015-06-26 14:57:41 +02:00
parent b647ccfa67
commit 0cc39e50e1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/gis_tests/gdal_tests/test_raster.py
View File

@ -54,7 +54,7 @@ from django.utils._os import upath
from ..data.rasters.textrasters import JSON_RASTER from ..data.rasters.textrasters import JSON_RASTER
if HAS_GDAL: if HAS_GDAL:
from django.contrib.gis.gdal import GDALRaster from django.contrib.gis.gdal import GDALRaster, GDAL_VERSION
from django.contrib.gis.gdal.raster.band import GDALBand from django.contrib.gis.gdal.raster.band import GDALBand
@ -211,8 +211,9 @@ class GDALRasterTests(unittest.TestCase):
12.0, 13.0, 14.0, 15.0] 12.0, 13.0, 14.0, 15.0]
) )
@unittest.skipIf(GDAL_VERSION < (1, 8, 1), "GDAL >= 1.8.1 is required for this test")
def test_raster_transform(self): def test_raster_transform(self):
if GDAL_VERSION < (1, 8, 1):
self.skipTest("GDAL >= 1.8.1 is required for this test")
# Prepare tempfile and nodata value # Prepare tempfile and nodata value
rstfile = tempfile.NamedTemporaryFile(suffix='.tif') rstfile = tempfile.NamedTemporaryFile(suffix='.tif')
ndv = 99 ndv = 99