test phase again updated subject to a bump of nose with the result that pypy is no longer skipped

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

3 files changed, 22 insertions, 18 deletions

diff --git a/dev-python/cherrypy/ChangeLog b/dev-python/cherrypy/ChangeLog
index 275549ba4e33..3fb45a6800f1 100644
--- a/dev-python/cherrypy/ChangeLog
+++ b/dev-python/cherrypy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/cherrypy
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/ChangeLog,v 1.63 2014/05/16 04:25:19 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/ChangeLog,v 1.64 2014/05/16 15:01:25 idella4 Exp $
+
+  16 May 2014; Ian Delaney <idella4@gentoo.org> cherrypy-3.3.0.ebuild:
+  test phase again updated subject to a bump of nose with the result that pypy
+  is no longer skipped
 
   16 May 2014; Ian Delaney <idella4@gentoo.org> cherrypy-3.3.0.ebuild:
   update test phase
diff --git a/dev-python/cherrypy/Manifest b/dev-python/cherrypy/Manifest
index ec0a2ed93e52..d5fbe6c207bd 100644
--- a/dev-python/cherrypy/Manifest
+++ b/dev-python/cherrypy/Manifest
@@ -17,13 +17,13 @@ EBUILD cherrypy-3.2.1.ebuild 1275 SHA256 e1571688f70795fbeb1180953523fd149f0334d
 EBUILD cherrypy-3.2.2-r1.ebuild 1605 SHA256 c1ac12f4fc778ebd720b713cabacf37053c3c847df441aaea66a64a01e378e33 SHA512 15793c963118e71c3c15771c54f8b8b7ea23d723e42a4d787af570ce5bb3e499e0d58d2df99f462b4d87da51c21be4db9e23375e17728bf45a6a43a5001a90ca WHIRLPOOL 3fe040d7d7aae6305052791253667d2bfc49ad3f33bf208688e868b94dcb63bda93421a20a8942a7a7f5f4a5c0a22483255d87472a2b90ab8af3d1a15e25dab5
 EBUILD cherrypy-3.2.2.ebuild 1233 SHA256 f6552d3bd15783bcd4c69633702295271191ae840282511fd9e3140836ebf72b SHA512 91d76de71c9032a88df0b5a90e4f4a69b9438923326e8bc252f5368267de02dca89cc3da121951a15837c2393debb6cc5aab1dbdb51f347b6f03f9bc11d7577f WHIRLPOOL ab078a8354bf20788191ee340e3f5638d690bd6077d89a57b031383d0482f9ce980d8b61e4e596384a435f275aba6eaa456ed2af87909131f3a5c51f0fc90cf6
 EBUILD cherrypy-3.2.5.ebuild 1412 SHA256 825d9e2a5db765050b1eb19ea78d036ab53c8f78698da6ebc0a45b5fb87913b6 SHA512 ca391abdf2acdd5cafc59653f1b32d278d248f81752e5fa86a961301ee341086e6c55c42fe1b7a22bc90fea313a99192c75a9ebf7f82285dae6fe4aa7aa50e82 WHIRLPOOL 701fcc6b2f0b844b5dc9adb465e97f57700f585898482a7f9c5dd8261eefa27d872341b9d4ffd48670821a52e2b17ad29ec2638f7fb0e193504751e95c55f2f7
-EBUILD cherrypy-3.3.0.ebuild 1624 SHA256 6c3526a75d9634173eccbeee94bf3c2ea579d1665bf877b4cf30c2f9458b1202 SHA512 1d5e9d7ec50cd135fc27fb63915975bd08a333d077b9a8288fcdff60e74aa2e4781c3d9a6e18342e7e6e278c464d7039b7392b44117848803c7dac75a81c8f1d WHIRLPOOL e7efc28545023ca9243b2326aff36ff5dabc8d7dac493c270a66269176d488e8c42d5b9f94ef384badf040d8703ac336e88c30e375c2cd3331420725d8ba312e
-MISC ChangeLog 9734 SHA256 a4f10364685407340a05e4d9ec69dc8c0346d839672ac0011866268aa601c67b SHA512 399fe7dad3a5930cc0236a2492fd70c545a258b3546e014acc36bdf4382f88657a5188e660c180b19d2eedf3ee417324a8de3d96b928752931d60ae415f470d4 WHIRLPOOL cafe9e4213c7e2cc752f382f7f52c0b96fa98b4f20a75a6658d748e430d3b116b632f2b4ac827950abe4df56a0548f902e19070dee381e81168b8ab06fe4cba5
+EBUILD cherrypy-3.3.0.ebuild 1872 SHA256 6419936d2f0a03c346919dd53b45244409e56ef8a01e87f2ef72b58c261de161 SHA512 667519f89ccb9057a61b4eb483cc1f704b0d97e0fa2c13b1af55c44c20e6fd37bc42152d813b4f0feef716c6cd90813cc9fb2b0177272377dd621118dd49c590 WHIRLPOOL d3fc9430dc5b1b9a0783debe508f04e1ae6f80afbc4bc52f04b39f5c479aa58f23008c1de7b9a0dec24973ea4a1673d8048a42fbc6a54c6c4d2dd4202dc2ff06
+MISC ChangeLog 9908 SHA256 49a21d720a5f9d6bdeafbb7344c79819e6cdfb508c04e31487f5215dd4f76592 SHA512 fc13513c38ca27ef89c8da4556ba238828ef9e5e219e1b1f325d8f75e2f407160c989a57b96acf1659693553fe65705cb4bf31b250b93dd1bd5bf4df7a54af07 WHIRLPOOL 3c16a36ac03c658447c931ac51fb515fcf8b669b38ac992ca8af2ab0cfc5ed1e56528c39475d6f092b8504b7f77a59ec373d507e36e4cf409d479d7b11286c23
 MISC metadata.xml 160 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a SHA512 7c02a1de1ddcb6b7c6378cceff0458da3a15d5381417f7cdf01874e7c372664b8899863f41b3a2fd8d6ad67ceb732dac6da0cc17575bf8e3e6d89480417c6628 WHIRLPOOL ed2795e4466eda8c804d5067c87386e269a59fe959393057ca5ddc36851e00f5210c4da1adf4bbdfdbb7d1d3d5c60aced25727ca12fdc8305d9e263a3aca9b13
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlN1kWQACgkQso7CE7gHKw2EvACfdQgrp9lyCSPUdqKfPdj2FK7h
-F4oAn1xPzJz/NnUFd45RTBFtWkt+Z+/8
-=6jZI
+iEYEAREIAAYFAlN2JnsACgkQso7CE7gHKw0nbQCfZ5u8Z8sAjGrcMzdkFfLJPBvv
+BtIAoLLnzMFsIOuq41ZL8q1N5T6xL2RN
+=LuoE
 -----END PGP SIGNATURE-----
diff --git a/dev-python/cherrypy/cherrypy-3.3.0.ebuild b/dev-python/cherrypy/cherrypy-3.3.0.ebuild
index 7434eb219eae..250761a31f6a 100644
--- a/dev-python/cherrypy/cherrypy-3.3.0.ebuild
+++ b/dev-python/cherrypy/cherrypy-3.3.0.ebuild
@@ -1,6 +1,6 @@
 # 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.3.0.ebuild,v 1.2 2014/05/16 04:25:19 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/cherrypy-3.3.0.ebuild,v 1.3 2014/05/16 15:01:25 idella4 Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
@@ -19,7 +19,7 @@ KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-ma
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+	test? ( >=dev-python/nose-1.3.3[${PYTHON_USEDEP}] )"
 RDEPEND=""
 S="${WORKDIR}/${MY_P}"
 
@@ -34,20 +34,20 @@ python_prepare_all() {
 }
 
 python_test() {
+	# suite requires current latest nose-1.3.3
+	# https://bitbucket.org/cherrypy/cherrypy/issue/1308
+	# https://bitbucket.org/cherrypy/cherrypy/issue/1306
 	local exclude=(
-		# https://bitbucket.org/cherrypy/cherrypy/issue/1306
-		-e test_session
-
-		# https://bitbucket.org/cherrypy/cherrypy/issue/1308
-		-e test_file_stream
-
-		# https://bitbucket.org/cherrypy/cherrypy/issue/1315
-		-e test_HTTP11_pipelining
+		-e test_file_stream -e test_4_File_deletion -e test_3_Redirect
+		-e test_2_File_Concurrency -e test_0_Session -e testStatic
 	)
 
 	# This really doesn't sit well with multiprocessing
-	# https://github.com/nose-devs/nose/issues/808
-	if ! [[ "${EPYTHON}" == pypy ]]; then
+	# The issue 1306 tells us some tests are subject to the deleterious effects of
+	# the 'race condition'.  Both the issues are unresolved / open
+	if [[ "${EPYTHON}" == pypy ]]; then
+		nosetests "${exclude[@]}" -I test_logging.py < /dev/tty || die "Testing failed with${EPYTHON}"
+	else
 		nosetests "${exclude[@]}" < /dev/tty || die "Testing failed with ${EPYTHON}"
 	fi
 }