diff options
| author |   Ian Delaney <idella4@gentoo.org> | 2014-03-30 13:05:38 +0000 |
|---|---|---|
| committer | Ian Delaney <idella4@gentoo.org> | 2014-03-30 13:05:38 +0000 |
| commit | 7cd32fb22ae97ce7206222bdcec8c2715e018754 (patch) | |
| tree | 562f5b93c971858f362ded2631ff3bea28bd55bb /dev-python/cherrypy | |
| parent | version bump, removed old version (diff) | |
| download | gentoo-2-7cd32fb22ae97ce7206222bdcec8c2715e018754.tar.gz gentoo-2-7cd32fb22ae97ce7206222bdcec8c2715e018754.tar.bz2 gentoo-2-7cd32fb22ae97ce7206222bdcec8c2715e018754.zip | |
edit out broken tests wrt Bug #494054 by eroen
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)
Diffstat (limited to 'dev-python/cherrypy')
| -rw-r--r-- | dev-python/cherrypy/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-python/cherrypy/cherrypy-3.2.2-r1.ebuild | 25 |
2 files changed, 27 insertions, 5 deletions
diff --git a/dev-python/cherrypy/ChangeLog b/dev-python/cherrypy/ChangeLog index ea7bbfcc09f1..64b0e997bbfd 100644 --- a/dev-python/cherrypy/ChangeLog +++ b/dev-python/cherrypy/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-python/cherrypy -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/ChangeLog,v 1.56 2013/10/22 11:38:39 grobian Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/ChangeLog,v 1.57 2014/03/30 13:05:38 idella4 Exp $ + + 30 Mar 2014; Ian Delaney <idella4@gentoo.org> cherrypy-3.2.2-r1.ebuild: + edit out broken tests wrt Bug #494054 by eroen 22 Oct 2013; Fabian Groffen <grobian@gentoo.org> cherrypy-3.2.2-r1.ebuild: Marked ~x64-macos, bug #487670 diff --git a/dev-python/cherrypy/cherrypy-3.2.2-r1.ebuild b/dev-python/cherrypy/cherrypy-3.2.2-r1.ebuild index c21136106d14..5e2ae4920515 100644 --- a/dev-python/cherrypy/cherrypy-3.2.2-r1.ebuild +++ b/dev-python/cherrypy/cherrypy-3.2.2-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/cherrypy-3.2.2-r1.ebuild,v 1.8 2013/10/22 11:38:39 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/cherrypy-3.2.2-r1.ebuild,v 1.9 2014/03/30 13:05:38 idella4 Exp $ EAPI=5 PYTHON_COMPAT=( python{2_6,2_7,3_2} pypy2_0 ) @@ -21,9 +21,28 @@ IUSE="test" DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] test? ( dev-python/nose[${PYTHON_USEDEP}] )" RDEPEND="" - S="${WORKDIR}/${MY_P}" +# Both req'd for test phase +DISTUTILS_IN_SOURCE_BUILD=1 +DISTUTILS_NO_PARALLEL_BUILD=1 + +python_prepare_all() { + sed -e 's:test_file_stream:_&:' -i cherrypy/test/test_static.py || die + distutils-r1_python_prepare_all +} python_test() { + # https://bitbucket.org/cherrypy/cherrypy/issue/1308/testsuite-failures-x-5-test_file_stream + if python_is_python3; then + sed -e 's:test_HTTP11_pipelining:_&:' -i cherrypy/test/test_conn.py || die + elif [[ "${EPYTHON}" == "pypy-c2.0" || "${EPYTHON}" == "pypy-c" ]]; then + einfo "done" + sed -e 's:testEscapedOutput:_&:' \ + -e 's:testNormalReturn:_&:' \ + -e 's:testTracebacks:_&:' \ + -e 's:testNormalYield:_&:' \ + -i cherrypy/test/test_logging.py || die + fi + # This really doesn't sit well with multiprocessing nosetests < /dev/tty || die "Testing failed with ${EPYTHON}" } |