From 2409bbce9f7c578b6baa099049172839ac57270f Mon Sep 17 00:00:00 2001 From: Neil Date: Fri, 15 Jul 2011 22:18:47 +0200 Subject: [PATCH] Only call MultiImage if PIL is available to ensure nose handles this case properly --- scikits/image/io/tests/test_collection.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scikits/image/io/tests/test_collection.py b/scikits/image/io/tests/test_collection.py index 2f74a89a..71fc0fde 100644 --- a/scikits/image/io/tests/test_collection.py +++ b/scikits/image/io/tests/test_collection.py @@ -64,7 +64,8 @@ class TestMultiImage(): def setUp(self): # This multipage TIF file was created with imagemagick: # convert im1.tif im2.tif -adjoin multipage.tif - self.img = MultiImage(os.path.join(data_dir, 'multipage.tif')) + if PIL_available: + self.img = MultiImage(os.path.join(data_dir, 'multipage.tif')) @skipif(not PIL_available) def test_len(self):