Skip to content

Test support for centos/amazon linux #2585

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wiredfool merged 2 commits into from
Jul 1, 2017
Merged

Test support for centos/amazon linux #2585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20da797
updates for centos/amazonlinux
wiredfool Jun 21, 2017
65c6051
turn on centos, amazon linux
wiredfool Jun 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ matrix:
- env: DOCKER="ubuntu-xenial-amd64"
- env: DOCKER="ubuntu-precise-amd64"
- env: DOCKER="debian-stretch-x86"
- env: DOCKER="centos-6-amd64"
- env: DOCKER="amazon-amd64"

dist: trusty

Expand Down
36 changes: 29 additions & 7 deletions Tests/test_imagefont.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,26 @@ def __exit__(self, type, value, traceback):
class TestImageFont(PillowTestCase):
LAYOUT_ENGINE = ImageFont.LAYOUT_BASIC

# Freetype has different metrics depending on the version.
# (and, other things, but first things first)
METRICS = { ('2', '3'): {'multiline': 30,
'textsize': 12,
'getters': (13, 16)},
('2', '7'): {'multiline': 6.2,
'textsize': 2.5,
'getters': (12, 16)},
('2', '8'): {'multiline': 6.2,
'textsize': 2.5,
'getters': (12, 16)},
'Default': {'multiline': 0.5,
'textsize': 0.5,
'getters': (12, 16)},
}

def setUp(self):
freetype_version = tuple(ImageFont.core.freetype2_version.split('.'))[:2]
self.metrics = self.METRICS.get(freetype_version, self.METRICS['Default'])

def get_font(self):
return ImageFont.truetype(FONT_PATH, FONT_SIZE,
layout_engine=self.LAYOUT_ENGINE)
Expand Down Expand Up @@ -125,7 +145,7 @@ def test_textsize_equal(self):
target_img = Image.open(target)

# Epsilon ~.5 fails with FreeType 2.7
self.assert_image_similar(im, target_img, 2.5)
self.assert_image_similar(im, target_img, self.metrics['textsize'])

def test_render_multiline(self):
im = Image.new(mode='RGB', size=(300, 100))
Expand All @@ -144,7 +164,7 @@ def test_render_multiline(self):
# some versions of freetype have different horizontal spacing.
# setting a tight epsilon, I'm showing the original test failure
# at epsilon = ~38.
self.assert_image_similar(im, target_img, 6.2)
self.assert_image_similar(im, target_img, self.metrics['multiline'])

def test_render_multiline_text(self):
ttf = self.get_font()
Expand All @@ -159,7 +179,7 @@ def test_render_multiline_text(self):
target_img = Image.open(target)

# Epsilon ~.5 fails with FreeType 2.7
self.assert_image_similar(im, target_img, 6.2)
self.assert_image_similar(im, target_img, self.metrics['multiline'])

# Test that text() can pass on additional arguments
# to multiline_text()
Expand All @@ -180,7 +200,7 @@ def test_render_multiline_text(self):
target_img = Image.open(target)

# Epsilon ~.5 fails with FreeType 2.7
self.assert_image_similar(im, target_img, 6.2)
self.assert_image_similar(im, target_img, self.metrics['multiline'])

def test_unknown_align(self):
im = Image.new(mode='RGB', size=(300, 100))
Expand Down Expand Up @@ -228,9 +248,11 @@ def test_multiline_spacing(self):

target = 'Tests/images/multiline_text_spacing.png'
target_img = Image.open(target)

from PIL import ImageChops

ImageChops.difference(im, target_img).save('multiline.png')
Copy link
Member

@homm homm Jul 9, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this debug file output leaved by mistake?

Copy link
Member Author

@wiredfool wiredfool Jul 9, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. Sigh.

Copy link
Member

@radarhere radarhere Jul 16, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This has now been addressed by PR #2623

# Epsilon ~.5 fails with FreeType 2.7
self.assert_image_similar(im, target_img, 6.2)
self.assert_image_similar(im, target_img, self.metrics['multiline'])

def test_rotated_transposed_font(self):
img_grey = Image.new("L", (100, 100))
Expand Down Expand Up @@ -460,7 +482,7 @@ def test_imagefont_getters(self):
self.assertEqual(t.font.glyphs, 4177)
self.assertEqual(t.getsize('A'), (12, 16))
self.assertEqual(t.getsize('AB'), (24, 16))
self.assertEqual(t.getsize('M'), (12, 16))
self.assertEqual(t.getsize('M'), self.metrics['getters'])
self.assertEqual(t.getsize('y'), (12, 20))
self.assertEqual(t.getsize('a'), (12, 16))

Expand Down