Merge pull request #945 from mdboom/test-without-pil

mdboom · mdboom · commit c42441a97fcf · 2012-06-12T07:03:47.000-07:00
Make PIL-specific test as knownfailure if PIL is not installed.
diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py
@@ -10,6 +10,12 @@
 import io
 import os
 
+try:
+    from PIL import Image
+    HAS_PIL = True
+except ImportError:
+    HAS_PIL = False
+
 @image_comparison(baseline_images=['image_interps'])
 def test_image_interps():
     'make the basic nearest, bilinear and bicubic interps'
@@ -76,9 +82,10 @@ def test_image_python_io():
     buffer.seek(0)
     plt.imread(buffer)
 
+@knownfailureif(not HAS_PIL)
 def test_imread_pil_uint16():
     img = plt.imread(os.path.join(os.path.dirname(__file__),
-                     'baseline_images/test_image/uint16.tif'))
+                     'baseline_images', 'test_image', 'uint16.tif'))
     assert (img.dtype == np.uint16)
     assert np.sum(img) == 134184960
 
