[2.2.x] Skipped GetImageDimensionsTests.test_webp when WEBP is not installed.

Bumped minimum Pillow version to 4.2.0 in test requirements.

Backport of fce389af7cf95151118c9fc7cafd777a31f94946 from master

1 files changed, 4 insertions, 1 deletions

diff --git a/tests/files/tests.py b/tests/files/tests.py
index b50061649a..c60d69bf6a 100644
--- a/tests/files/tests.py
+++ b/tests/files/tests.py
@@ -17,9 +17,11 @@ from django.core.files.uploadedfile import (
 )
 
 try:
-    from PIL import Image
+    from PIL import Image, features
+    HAS_WEBP = features.check('webp')
 except ImportError:
     Image = None
+    HAS_WEBP = False
 else:
     from django.core.files import images
 
@@ -343,6 +345,7 @@ class GetImageDimensionsTests(unittest.TestCase):
                 size = images.get_image_dimensions(fh)
                 self.assertEqual(size, (None, None))
 
+    @unittest.skipUnless(HAS_WEBP, 'WEBP not installed')
     def test_webp(self):
         img_path = os.path.join(os.path.dirname(__file__), 'test.webp')
         with open(img_path, 'rb') as fh: