From 8a461c82a13e1a2b88acd845122f1960a8d04491 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Sun, 28 May 2017 13:29:12 -0400 Subject: [PATCH] dev-python/pytest: disable test_pdb This test hangs/errors in an ebuild environment, but works fine outside of an ebuild. Bug: https://bugs.gentoo.org/598442 Package-Manager: Portage-2.3.6_p1, Repoman-2.3.2_p69 --- dev-python/pytest/pytest-3.0.3.ebuild | 3 +++ dev-python/pytest/pytest-3.0.6.ebuild | 3 +++ dev-python/pytest/pytest-3.0.7.ebuild | 4 ++++ 3 files changed, 10 insertions(+) diff --git a/dev-python/pytest/pytest-3.0.3.ebuild b/dev-python/pytest/pytest-3.0.3.ebuild index 2d267397c09bd..61fe2a0d9fb8e 100644 --- a/dev-python/pytest/pytest-3.0.3.ebuild +++ b/dev-python/pytest/pytest-3.0.3.ebuild @@ -46,6 +46,9 @@ python_prepare_all() { sed -e "s/return points/return {'py.test': target}/" -i setup.py || die "sed failed" grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency" + # https://bugs.gentoo.org/598442 + rm testing/test_pdb.py || die + distutils-r1_python_prepare_all } diff --git a/dev-python/pytest/pytest-3.0.6.ebuild b/dev-python/pytest/pytest-3.0.6.ebuild index 310de5faf9e8e..77e0facf03fb4 100644 --- a/dev-python/pytest/pytest-3.0.6.ebuild +++ b/dev-python/pytest/pytest-3.0.6.ebuild @@ -46,6 +46,9 @@ python_prepare_all() { sed -e "s/return points/return {'py.test': target}/" -i setup.py || die "sed failed" grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency" + # https://bugs.gentoo.org/598442 + rm testing/test_pdb.py || die + distutils-r1_python_prepare_all } diff --git a/dev-python/pytest/pytest-3.0.7.ebuild b/dev-python/pytest/pytest-3.0.7.ebuild index 461d9ebbc842b..df2c80f0735a3 100644 --- a/dev-python/pytest/pytest-3.0.7.ebuild +++ b/dev-python/pytest/pytest-3.0.7.ebuild @@ -46,6 +46,10 @@ python_prepare_all() { sed -e "s/return points/return {'py.test': target}/" -i setup.py || die "sed failed" grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency" + # Something in the ebuild environment causes this to hang/error. + # https://bugs.gentoo.org/598442 + rm testing/test_pdb.py || die + distutils-r1_python_prepare_all }