re-set things 'test'

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

2 files changed, 10 insertions, 20 deletions

diff --git a/dev-python/python-keystoneclient/ChangeLog b/dev-python/python-keystoneclient/ChangeLog
index c45f268088ee..4722a5034092 100644
--- a/dev-python/python-keystoneclient/ChangeLog
+++ b/dev-python/python-keystoneclient/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/python-keystoneclient
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-keystoneclient/ChangeLog,v 1.24 2013/12/19 02:05:16 prometheanfire Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-keystoneclient/ChangeLog,v 1.25 2014/01/06 10:44:44 idella4 Exp $
+
+  06 Jan 2014; Ian Delaney <idella4@gentoo.org>
+  python-keystoneclient-0.4.1.ebuild:
+  re-set things 'test'
 
   19 Dec 2013; Matthew Thode <prometheanfire@gentoo.org>
   python-keystoneclient-0.3.1.ebuild, python-keystoneclient-0.3.2.ebuild,
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-0.4.1.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-0.4.1.ebuild
index 722211ea5c14..646f31fef09b 100644
--- a/dev-python/python-keystoneclient/python-keystoneclient-0.4.1.ebuild
+++ b/dev-python/python-keystoneclient/python-keystoneclient-0.4.1.ebuild
@@ -1,9 +1,8 @@
-# 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/python-keystoneclient/python-keystoneclient-0.4.1.ebuild,v 1.2 2013/12/19 02:05:15 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-keystoneclient/python-keystoneclient-0.4.1.ebuild,v 1.3 2014/01/06 10:44:44 idella4 Exp $
 
 EAPI=5
-#testsuite has unpretty httpretty deps
 PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
@@ -16,12 +15,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc examples test"
-RESTRICT="test"
 
-#Note; https://github.com/gabrielfalcao/HTTPretty/blob/b5827151ddde2e3fed49f5a1ca7f2bb2ef8876a1/requirements.txt
-#https://github.com/openstack/python-keystoneclient/blob/0.3.2/test-requirements.txt
-#https://bugs.launchpad.net/python-keystoneclient/+bug/1243528
-#				>=dev-python/httpretty-0.6.3[${PYTHON_USEDEP}]
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		>=dev-python/pbr-0.5.21[${PYTHON_USEDEP}]
 		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
@@ -31,6 +25,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 				>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
 				>=dev-python/keyring-1.6.1[${PYTHON_USEDEP}]
 				<dev-python/keyring-2.0[${PYTHON_USEDEP}]
+				>=dev-python/httpretty-0.6.3[${PYTHON_USEDEP}]
 				>=dev-python/mock-1.0[${PYTHON_USEDEP}]
 				>=dev-python/mox-0.5.3[${PYTHON_USEDEP}]
 				>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
@@ -60,20 +55,11 @@ python_compile_all() {
 	use doc && emake -C doc html
 }
 
-# Made more reliant upon httpretty. python test phase is a w.i.p until httpretty is 'sorted'
 python_test() {
 	# https://bugs.launchpad.net/python-keystoneclient/+bug/1243528
-	# https://bugs.launchpad.net/python-keystoneclient/+bug/1174410; last touched on 
-	# 2013-05-29 with 'importance: 	Undecided → Medium' and never worked since.
-	sed -e 's:test_encrypt_cache_data:_&:' \
-		-e 's:test_no_memcache_protection:_&:' \
-		-e 's:test_sign_cache_data:_&:' \
-		-i keystoneclient/tests/test_auth_token_middleware.py
-	rm -f $(find keystoneclient/tests/v2_0/ -name "test_*") || die
-	rm -f $(find keystoneclient/tests/v3/ -name "test_*") || die
 	testr init
 	testr run || die "testsuite failed under python2.7"
-	flake8 tests || die "run over tests folder by flake8 drew error"
+	flake8 ${PN/python-/}/tests || die "run over tests folder by flake8 drew error"
 }
 
 python_install_all() {