python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-01-26 09:14:27 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2090 from wiredfool/pr_2083

Browse Source 
Skip failing numpy tests on Pypy <= 5.3.1
This commit is contained in:
wiredfool 2016-08-25 11:57:57 +01:00 committed by GitHub
commit b77adf4692
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Tests/test_numpy.py
View File

@ -1,4 +1,5 @@
from __future__ import print_function from __future__ import print_function
import sys
from helper import unittest, PillowTestCase, hopper from helper import unittest, PillowTestCase, hopper
from PIL import Image from PIL import Image
@ -14,6 +15,13 @@ except ImportError:
TEST_IMAGE_SIZE = (10, 10) TEST_IMAGE_SIZE = (10, 10)
# Numpy on pypy as of pypy 5.3.1 is corrupting the numpy.array(Image)
# call such that it's returning a object of type numpy.ndarray, but
# the repr is that of a PIL.Image. Size and shape are 1 and (), not the
# size and shape of the array. This causes failures in several tests.
SKIP_NUMPY_ON_PYPY = hasattr(sys, 'pypy_version_info') and (
sys.pypy_version_info <= (5,3,1,'final',0))
class TestNumpy(PillowTestCase): class TestNumpy(PillowTestCase):
def setUp(self): def setUp(self):
@ -104,6 +112,7 @@ class TestNumpy(PillowTestCase):
self.assert_image(Image.fromarray(a[:, :, 1]), "L", TEST_IMAGE_SIZE) self.assert_image(Image.fromarray(a[:, :, 1]), "L", TEST_IMAGE_SIZE)
def _test_img_equals_nparray(self, img, np): def _test_img_equals_nparray(self, img, np):
self.assertGreaterEqual(len(np.shape), 2)
np_size = np.shape[1], np.shape[0] np_size = np.shape[1], np.shape[0]
self.assertEqual(img.size, np_size) self.assertEqual(img.size, np_size)
px = img.load() px = img.load()
@ -111,6 +120,7 @@ class TestNumpy(PillowTestCase):
for y in range(0, img.size[1], int(img.size[1]/10)): for y in range(0, img.size[1], int(img.size[1]/10)):
self.assert_deep_equal(px[x, y], np[y, x]) self.assert_deep_equal(px[x, y], np[y, x])
@unittest.skipIf(SKIP_NUMPY_ON_PYPY, "numpy.array(Image) is flaky on PyPy")
def test_16bit(self): def test_16bit(self):
img = Image.open('Tests/images/16bit.cropped.tif') img = Image.open('Tests/images/16bit.cropped.tif')
np_img = numpy.array(img) np_img = numpy.array(img)
@ -141,6 +151,7 @@ class TestNumpy(PillowTestCase):
im_good = Image.open(filename) im_good = Image.open(filename)
self.assert_image_equal(im_good, im_test) self.assert_image_equal(im_good, im_test)
@unittest.skipIf(SKIP_NUMPY_ON_PYPY, "numpy.array(Image) is flaky on PyPy")
def test_to_array(self): def test_to_array(self):
def _to_array(mode, dtype): def _to_array(mode, dtype):