Edit, remove from Description, update test phase

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

4 files changed, 14 insertions, 11 deletions

diff --git a/sys-auth/keystone/ChangeLog b/sys-auth/keystone/ChangeLog
index ca66806aae46..7f52f59f6439 100644
--- a/sys-auth/keystone/ChangeLog
+++ b/sys-auth/keystone/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-auth/keystone
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/ChangeLog,v 1.47 2013/11/18 03:24:30 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/ChangeLog,v 1.48 2013/11/28 04:51:37 idella4 Exp $
+
+  28 Nov 2013; Ian Delaney <idella4@gentoo.org> keystone-2013.2-r1.ebuild,
+  keystone-2013.2.9999.ebuild, keystone-9999.ebuild:
+  Edit, remove  from Description, update test phase
 
 *keystone-2013.2-r1 (18 Nov 2013)
 *keystone-2013.1.4-r1 (18 Nov 2013)
diff --git a/sys-auth/keystone/keystone-2013.2-r1.ebuild b/sys-auth/keystone/keystone-2013.2-r1.ebuild
index 29e7c477dbb0..82683a775bd6 100644
--- a/sys-auth/keystone/keystone-2013.2-r1.ebuild
+++ b/sys-auth/keystone/keystone-2013.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2013.2-r1.ebuild,v 1.1 2013/11/18 03:24:30 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2013.2-r1.ebuild,v 1.2 2013/11/28 04:51:37 idella4 Exp $
 
 EAPI=5
 
@@ -81,13 +81,14 @@ PATCHES=(
 
 python_prepare_all() {
 	mkdir ${PN}/tests/tmp || die
-	cp -r "${FILESDIR}"/no_admin_token_auth-paste.ini ${PN}/tests/tmp/
+	cp etc/keystone-paste.ini ${PN}/tests/tmp/ || die
 	distutils-r1_python_prepare_all
 }
 
 python_test() {
-	# https://bugs.launchpad.net/keystone/+bug/1249198
-	nosetests || die "testsuite failed under ${EPYTHON}"
+	# Ignore (naughty) test_.py files & 1 test that connect to the network
+	nosetests -I 'test_keystoneclient*' \
+		-e test_import || die "testsuite failed under python2.7"
 }
 
 python_install() {
diff --git a/sys-auth/keystone/keystone-2013.2.9999.ebuild b/sys-auth/keystone/keystone-2013.2.9999.ebuild
index 3b9c074180d3..a1633058d8f7 100644
--- a/sys-auth/keystone/keystone-2013.2.9999.ebuild
+++ b/sys-auth/keystone/keystone-2013.2.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2013.2.9999.ebuild,v 1.3 2013/11/18 03:24:30 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2013.2.9999.ebuild,v 1.4 2013/11/28 04:51:37 idella4 Exp $
 
 EAPI=5
 #test restricted becaues of bad requirements given (old webob for instance)
@@ -9,8 +9,7 @@ PYTHON_COMPAT=( python2_7 )
 
 inherit git-2 distutils-r1
 
-DESCRIPTION="Keystone is the Openstack authentication, authorization, and
-service catalog written in Python."
+DESCRIPTION="The Openstack authentication, authorization, and service catalog written in Python."
 HOMEPAGE="https://launchpad.net/keystone"
 EGIT_REPO_URI="https://github.com/openstack/keystone.git"
 EGIT_BRANCH="stable/havana"
diff --git a/sys-auth/keystone/keystone-9999.ebuild b/sys-auth/keystone/keystone-9999.ebuild
index a6288296e607..c723a0e4bb8c 100644
--- a/sys-auth/keystone/keystone-9999.ebuild
+++ b/sys-auth/keystone/keystone-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-9999.ebuild,v 1.11 2013/09/27 01:43:20 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-9999.ebuild,v 1.12 2013/11/28 04:51:37 idella4 Exp $
 
 EAPI=5
 #test restricted becaues of bad requirements given (old webob for instance)
@@ -9,8 +9,7 @@ PYTHON_COMPAT=( python2_7 )
 
 inherit git-2 distutils-r1
 
-DESCRIPTION="Keystone is the Openstack authentication, authorization, and
-service catalog written in Python."
+DESCRIPTION="The Openstack authentication, authorization, and service catalog written in Python."
 HOMEPAGE="https://launchpad.net/keystone"
 EGIT_REPO_URI="https://github.com/openstack/keystone.git"