dev-python/cssutils: Backport fix for test failures on pypy

Package-Manager: portage-2.2.25
Signed-off-by: Justin Lecher <jlec@gentoo.org>
This commit is contained in:
Justin Lecher
2015-11-26 10:27:15 +01:00
parent 38b67633ef
commit d924168b21
2 changed files with 36 additions and 2 deletions

View File

@@ -20,6 +20,10 @@ RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
test? ( dev-python/mock[${PYTHON_USEDEP}] )"
PATCHES=(
"${FILESDIR}"/${P}-pypy-test-backport.patch
)
python_prepare_all() {
# Disable test failing with dev-python/pyxml installed.
if has_version dev-python/pyxml; then
@@ -35,8 +39,6 @@ python_prepare_all() {
}
python_test() {
# https://bitbucket.org/cthedot/cssutils/issues/55
[[ "${EPYTHON}" =~ "pypy" ]] && return
ln -s "${S}/sheets" "${BUILD_DIR}/sheets" || die
# esetup.py test
# exclude tests that connect to the network

View File

@@ -0,0 +1,32 @@
# HG changeset patch
# User Daniel <kingdread@gmx.de>
# Date 1448482419 -3600
# Node ID 01a19d494b6f31e91c54ae39c5a6f43f6292a85d
# Parent 3a01bd18118a6466ad93aa23caaa4164528b59ac
Fix tests on PyPy 2
Tests fail because of the extra "u" prefix in the error message
diff --git a/src/cssutils/tests/test_profiles.py b/src/cssutils/tests/test_profiles.py
--- a/src/cssutils/tests/test_profiles.py
+++ b/src/cssutils/tests/test_profiles.py
@@ -2,6 +2,7 @@
__version__ = '$Id: test_cssvalue.py 1443 2008-08-31 13:54:39Z cthedot $'
import sys
+import platform
import basetest
import cssutils
@@ -124,6 +125,11 @@
expmsg = u"invalid literal for int(): x"
elif sys.platform.startswith('java'):
expmsg = u"invalid literal for int() with base 10: x"
+ # PyPy adds the u prefix, but only in versions lower than Python 3
+ elif (platform.python_implementation() == "PyPy" and
+ sys.version_info < (3, 0)):
+ expmsg = u"invalid literal for int() with base 10: u'x'"
+
self.assertRaisesMsg(Exception, expmsg,
cssutils.profile.validate, u'-test-funcval', u'x')