[Thuban-commits] r2843 - in trunk/thuban: . test

[scm-commit@wald.intevation.org]

Author: bernhard
Date: 2008-06-03 11:13:39 +0200 (Tue, 03 Jun 2008)
New Revision: 2843

Modified:
   trunk/thuban/ChangeLog
   trunk/thuban/test/test_baserenderer.py
   trunk/thuban/test/test_layer.py
Log:
* test/test_baserenderer.py, testtest_layer.py: Give the
gdal_support_status if there is no gdal support. Gives a better hint
about why this is missing (e.g. no gdalwarp.so). Thanks to 
Anthony Lenton.


Modified: trunk/thuban/ChangeLog
===================================================================
--- trunk/thuban/ChangeLog	2008-06-02 19:16:01 UTC (rev 2842)
+++ trunk/thuban/ChangeLog	2008-06-03 09:13:39 UTC (rev 2843)
@@ -1,3 +1,10 @@
+2008-06-03  Bernhard Reiter <bernhard at intevation.de>
+
+	* test/test_baserenderer.py, testtest_layer.py: Give the
+	gdal_support_status if there is no gdal support. Gives a better hint
+	about why this is missing (e.g. no gdalwarp.so). Thanks to 
+	Anthony Lenton.
+
 2008-06-02  Bernhard Herzog  <bh at intevation.de>
 
 	* Resources/XML/thuban-1.2.1.dtd, Resources/XML/thuban-1.1.dtd:

Modified: trunk/thuban/test/test_baserenderer.py
===================================================================
--- trunk/thuban/test/test_baserenderer.py	2008-06-02 19:16:01 UTC (rev 2842)
+++ trunk/thuban/test/test_baserenderer.py	2008-06-03 09:13:39 UTC (rev 2843)
@@ -102,7 +102,7 @@
                                resolution, dimensions, options):
 
         if not Thuban.Model.resource.has_gdal_support():
-            raise support.SkipTest("No gdal support")
+            raise support.SkipTest(Thuban.Model.resource.gdal_support_status)
 
         #print srcProj, dstProj,extents, resolution, dimensions, options
 
@@ -281,7 +281,7 @@
 
     def test_projected_raster_layer(self):
         if not Thuban.Model.resource.has_gdal_support():
-            raise support.SkipTest("No gdal support")
+            raise support.SkipTest(Thuban.Model.resource.gdal_support_status)
 
         layer = RasterLayer("raster layer",
                             os.path.join("..", "Data", "iceland",
@@ -347,7 +347,7 @@
 
     def test_projected_raster_decimalcommalocale(self):
         if not Thuban.Model.resource.has_gdal_support():
-            raise support.SkipTest("No gdal support")
+            raise support.SkipTest(Thuban.Model.resource.gdal_support_status)
 
         def _do_project_island():
             """Project island.tif and return result."""
@@ -381,7 +381,7 @@
         returned by gdalwarp.ProjectRasterFile to a BMP file data.
         """
         if not Thuban.Model.resource.has_gdal_support():
-            raise support.SkipTest("No gdal support")
+            raise support.SkipTest(Thuban.Model.resource.gdal_support_status)
 
         map = Map("TestBaseRenderer")
 

Modified: trunk/thuban/test/test_layer.py
===================================================================
--- trunk/thuban/test/test_layer.py	2008-06-02 19:16:01 UTC (rev 2842)
+++ trunk/thuban/test/test_layer.py	2008-06-03 09:13:39 UTC (rev 2843)
@@ -226,7 +226,7 @@
 
     def test_raster_layer(self):
         if not Thuban.Model.resource.has_gdal_support():
-            raise support.SkipTest("No gdal support")
+            raise support.SkipTest(Thuban.Model.resource.gdal_support_status)
 
         filename = self.build_path("island.tif")
         layer = RasterLayer("Test RasterLayer", filename)
@@ -475,7 +475,7 @@
 
     def test_raster_layer(self):
         if not Thuban.Model.resource.has_gdal_support():
-            raise support.SkipTest("No gdal support")
+            raise support.SkipTest(Thuban.Model.resource.gdal_support_status)
 
 
         filename = self.build_path("island.tif")