summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVirgil Dupras <vdupras@gentoo.org>2018-06-28 22:54:27 -0400
committerVirgil Dupras <vdupras@gentoo.org>2018-06-28 22:54:27 -0400
commit7dd0d64be1679025f5cc9c46da39b5b3ed2f8298 (patch)
tree9bc26b4bde40872ee7056e0649271771f00a6353 /dev-python/pillow
parentdev-python/pillow: exclude flaky tests (diff)
downloadgentoo-7dd0d64be1679025f5cc9c46da39b5b3ed2f8298.tar.gz
gentoo-7dd0d64be1679025f5cc9c46da39b5b3ed2f8298.tar.bz2
gentoo-7dd0d64be1679025f5cc9c46da39b5b3ed2f8298.zip
dev-python/pillow: make all tests pass on 4.3.0
Closes: https://bugs.gentoo.org/593816 Package-Manager: Portage-2.3.41, Repoman-2.3.9
Diffstat (limited to 'dev-python/pillow')
-rw-r--r--dev-python/pillow/files/pillow-4.3.0-freetype2.9-test-metrics.patch12
-rw-r--r--dev-python/pillow/pillow-4.3.0-r1.ebuild12
2 files changed, 15 insertions, 9 deletions
diff --git a/dev-python/pillow/files/pillow-4.3.0-freetype2.9-test-metrics.patch b/dev-python/pillow/files/pillow-4.3.0-freetype2.9-test-metrics.patch
new file mode 100644
index 000000000000..211ef7ac58d3
--- /dev/null
+++ b/dev-python/pillow/files/pillow-4.3.0-freetype2.9-test-metrics.patch
@@ -0,0 +1,12 @@
+--- a/Tests/test_imagefont.py
++++ b/Tests/test_imagefont.py
+@@ -58,6 +58,9 @@ class TestImageFont(PillowTestCase):
+ ('2', '8'): {'multiline': 6.2,
+ 'textsize': 2.5,
+ 'getters': (12, 16)},
++ ('2', '9'): {'multiline': 6.2,
++ 'textsize': 2.5,
++ 'getters': (12, 16)},
+ 'Default': {'multiline': 0.5,
+ 'textsize': 0.5,
+ 'getters': (12, 16)},
diff --git a/dev-python/pillow/pillow-4.3.0-r1.ebuild b/dev-python/pillow/pillow-4.3.0-r1.ebuild
index 28006e3c4115..9b35828ba01f 100644
--- a/dev-python/pillow/pillow-4.3.0-r1.ebuild
+++ b/dev-python/pillow/pillow-4.3.0-r1.ebuild
@@ -45,6 +45,8 @@ S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}"/pillow-4.3.0-no-scripts.patch
+ # can be removed at v5, patch already uptream. See bug 593816.
+ "${FILESDIR}"/pillow-4.3.0-freetype2.9-test-metrics.patch
)
python_compile() {
@@ -71,15 +73,7 @@ python_compile_all() {
python_test() {
"${PYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
- # These excluded tests below depend heavily on freetype being at the exact
- # same as the one pinned upstream. However, pillow supports a wider range
- # of freetype versions. These tests are more useful to upstream developer
- # than to us. Disabling. See bug 593816.
- virtx nosetests -vx \
- -e "test_multiline_spacing" \
- -e "test_render_multiline(_text)?" \
- -e "test_textsize_equal" \
- Tests/test_*.py
+ virtx nosetests -vx Tests/test_*.py
}
python_install() {