Merge pull request #930 from wiredfool/2.6.x

2.6.x-rc test fixes
This commit is contained in:
Hugo 2014-09-30 19:31:18 +03:00
commit 69994b11fb
3 changed files with 15 additions and 9 deletions

View File

@ -80,7 +80,7 @@ class TestImage(PillowTestCase):
ret = GimpGradientFile.sphere_increasing(middle, pos)
# Assert
self.assertEqual(ret, 0.9682458365518543)
self.assert_almost_equal(ret, 0.9682458365518543)
def test_sphere_decreasing(self):
# Arrange

View File

@ -63,8 +63,8 @@ class TestImageDraw(PillowTestCase):
del draw
# Assert
self.assert_image_equal(
im, Image.open("Tests/images/imagedraw_arc.png"))
self.assert_image_similar(
im, Image.open("Tests/images/imagedraw_arc.png"),1)
def test_arc1(self):
self.helper_arc(BBOX1)
@ -96,8 +96,8 @@ class TestImageDraw(PillowTestCase):
del draw
# Assert
self.assert_image_equal(
im, Image.open("Tests/images/imagedraw_chord.png"))
self.assert_image_similar(
im, Image.open("Tests/images/imagedraw_chord.png"),1)
def test_chord1(self):
self.helper_chord(BBOX1)
@ -115,8 +115,8 @@ class TestImageDraw(PillowTestCase):
del draw
# Assert
self.assert_image_equal(
im, Image.open("Tests/images/imagedraw_ellipse.png"))
self.assert_image_similar(
im, Image.open("Tests/images/imagedraw_ellipse.png"),1)
def test_ellipse1(self):
self.helper_ellipse(BBOX1)
@ -153,8 +153,8 @@ class TestImageDraw(PillowTestCase):
del draw
# Assert
self.assert_image_equal(
im, Image.open("Tests/images/imagedraw_pieslice.png"))
self.assert_image_similar(
im, Image.open("Tests/images/imagedraw_pieslice.png"),1)
def test_pieslice1(self):
self.helper_pieslice(BBOX1)

View File

@ -55,6 +55,12 @@ class TestImageFile(PillowTestCase):
if EpsImagePlugin.has_ghostscript():
im1, im2 = roundtrip("EPS")
# This test fails on Ubuntu 12.04, PPC (Bigendian) It
# appears to be a ghostscript 9.05 bug, since the
# ghostscript rendering is wonky and the file is identical
# to that written on ubuntu 12.04 x64
# md5sum: ba974835ff2d6f3f2fd0053a23521d4a
# EPS comes back in RGB:
self.assert_image_similar(im1, im2.convert('L'), 20)