From d924168b217c90faea5781e0c91fed0f5e797aab Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Thu, 26 Nov 2015 10:27:15 +0100 Subject: dev-python/cssutils: Backport fix for test failures on pypy Package-Manager: portage-2.2.25 Signed-off-by: Justin Lecher --- dev-python/cssutils/cssutils-1.0.1.ebuild | 6 ++-- .../files/cssutils-1.0.1-pypy-test-backport.patch | 32 ++++++++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 dev-python/cssutils/files/cssutils-1.0.1-pypy-test-backport.patch (limited to 'dev-python/cssutils') diff --git a/dev-python/cssutils/cssutils-1.0.1.ebuild b/dev-python/cssutils/cssutils-1.0.1.ebuild index 60fc7418d096..c2be49f955b6 100644 --- a/dev-python/cssutils/cssutils-1.0.1.ebuild +++ b/dev-python/cssutils/cssutils-1.0.1.ebuild @@ -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 diff --git a/dev-python/cssutils/files/cssutils-1.0.1-pypy-test-backport.patch b/dev-python/cssutils/files/cssutils-1.0.1-pypy-test-backport.patch new file mode 100644 index 000000000000..89c7608d3244 --- /dev/null +++ b/dev-python/cssutils/files/cssutils-1.0.1-pypy-test-backport.patch @@ -0,0 +1,32 @@ +# HG changeset patch +# User Daniel +# 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') -- cgit v1.2.3-65-gdbad