Fix tests in 1.4.3-r1, and port changes to 2.0.11. Bug 484222.

(Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)

3 files changed, 24 insertions, 8 deletions

diff --git a/dev-python/webtest/ChangeLog b/dev-python/webtest/ChangeLog
index 951db0b20c95..59856445b708 100644
--- a/dev-python/webtest/ChangeLog
+++ b/dev-python/webtest/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/webtest
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/webtest/ChangeLog,v 1.74 2014/01/08 05:25:54 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/webtest/ChangeLog,v 1.75 2014/01/11 22:06:26 floppym Exp $
+
+  11 Jan 2014; Mike Gilbert <floppym@gentoo.org> webtest-1.4.3-r1.ebuild,
+  webtest-2.0.11.ebuild:
+  Fix tests in 1.4.3-r1, and port changes to 2.0.11. Bug 484222.
 
 *webtest-2.0.11 (08 Jan 2014)
 
diff --git a/dev-python/webtest/webtest-1.4.3-r1.ebuild b/dev-python/webtest/webtest-1.4.3-r1.ebuild
index b54ae9a194d9..ca001d5b68ab 100644
--- a/dev-python/webtest/webtest-1.4.3-r1.ebuild
+++ b/dev-python/webtest/webtest-1.4.3-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/webtest/webtest-1.4.3-r1.ebuild,v 1.9 2013/10/05 07:05:20 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/webtest/webtest-1.4.3-r1.ebuild,v 1.10 2014/01/11 22:06:26 floppym Exp $
 
 EAPI=5
 
@@ -27,7 +27,8 @@ DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? ( dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pyquery[${PYTHON_USEDEP}] )"
+		dev-python/pyquery[${PYTHON_USEDEP}]
+		virtual/python-unittest2[${PYTHON_USEDEP}] )"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -37,7 +38,13 @@ python_compile_all() {
 	fi
 }
 
+src_test() {
+	DISTUTILS_NO_PARALLEL_BUILD=1 distutils-r1_src_test
+}
+
 python_test() {
+	# Tests raise ImportErrors with our default PYTHONPATH.
+	unset PYTHONPATH
 	nosetests || die "Tests fail with ${EPYTHON}"
 }
 
diff --git a/dev-python/webtest/webtest-2.0.11.ebuild b/dev-python/webtest/webtest-2.0.11.ebuild
index a9b2239d6f34..352e153d5cae 100644
--- a/dev-python/webtest/webtest-2.0.11.ebuild
+++ b/dev-python/webtest/webtest-2.0.11.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/webtest/webtest-2.0.11.ebuild,v 1.1 2014/01/08 05:25:54 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/webtest/webtest-2.0.11.ebuild,v 1.2 2014/01/11 22:06:26 floppym Exp $
 
 EAPI=5
 
-# sigh.
 RESTRICT="test"
 
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
@@ -37,8 +36,8 @@ DEPEND="${RDEPEND}
 	test? ( dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/pyquery[${PYTHON_USEDEP}]
 		dev-python/wsgiproxy2[${PYTHON_USEDEP}]
-		dev-python/paste
-		dev-python/pastedeploy )"
+		dev-python/pyquery[${PYTHON_USEDEP}]
+		virtual/python-unittest2[${PYTHON_USEDEP}] )"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -48,7 +47,13 @@ python_compile_all() {
 	fi
 }
 
+src_test() {
+	DISTUTILS_NO_PARALLEL_BUILD=1 distutils-r1_src_test
+}
+
 python_test() {
+	# Tests raise ImportErrors with our default PYTHONPATH.
+	unset PYTHONPATH
 	nosetests || die "Tests fail with ${EPYTHON}"
 }