update test runner to testr from nosetests

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
Manifest-Sign-Key: 0x92FEA28B

3 files changed, 48 insertions, 38 deletions

diff --git a/dev-python/oslotest/ChangeLog b/dev-python/oslotest/ChangeLog
index 727392ab8849..ab085e9a01d6 100644
--- a/dev-python/oslotest/ChangeLog
+++ b/dev-python/oslotest/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/oslotest
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/oslotest/ChangeLog,v 1.4 2014/09/27 08:40:28 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oslotest/ChangeLog,v 1.5 2014/09/27 19:20:47 alunduil Exp $
+
+  27 Sep 2014; Alex Brandt <alunduil@gentoo.org> oslotest-1.1.0.ebuild:
+  update test runner to testr from nosetests
 
   27 Sep 2014; Ian Delaney <idella4@gentoo.org> oslotest-1.1.0.ebuild:
   fix to doc install
diff --git a/dev-python/oslotest/Manifest b/dev-python/oslotest/Manifest
index 497f29408596..1e9444beaef2 100644
--- a/dev-python/oslotest/Manifest
+++ b/dev-python/oslotest/Manifest
@@ -4,13 +4,13 @@ Hash: SHA256
 DIST oslotest-1.0.0.tar.gz 12941 SHA256 cf05f4ff0cbf84ad0b5d1bef7c46d719eaf4408107e65a32a4500cf707d1a1e7 SHA512 79905da41eaf607c589686bcc413c1db900639b5b15687cb7640ebd844a94d0ae51f50864dac3f5004ae443f4dc53bb7b08c37007986ba3b86d5b1fcb6a3b962 WHIRLPOOL 5a762cc543fdcd2afcd8cd1fbeb4017fa4f7b305143f6b270d6f1e35f2e0693fad4484b85a3db75520e3c294bd575864b5afdb31d10065add30315df0215a305
 DIST oslotest-1.1.0.tar.gz 16048 SHA256 29b2380041f4f7632ed3368ac537beb2be869db44104d92c69f7a945a8253d9f SHA512 db52b0ed80ef0e6233d608b5d2c543d3a48a572a1df08e66da755a7ed0d73f03b298df3e35b747fe6659ea68cdfd801a3cd547beac0fec00c3e9128780898bed WHIRLPOOL fe3c2fa128c2b63bf363a47b1d5552230746bc8f7e5cf58f146b8db62882978ba8b103bcaed4ebe5885e365c85b30b57ea4e3103c845c25c2634d80559d95e91
 EBUILD oslotest-1.0.0.ebuild 1445 SHA256 ed86434010124283f12f36220fb4aad0fcd6ab32be9dea3e06d91f466b45463b SHA512 212e21e18a613cae487318eac8744a8f030e63bd1864e7c674962656d6f0e805ff170f41eeb4c9e070e93b42f1b06df5fd3ec609b8ce3e21409fd764177db400 WHIRLPOOL b075705734729caa2e6327d0f5fda7a724fc79e3e02ba02a4469aea499d9dee092435dc748ea3cc0744ae14a80a605018b1a7dda9e044263cd55b8b18bb37d10
-EBUILD oslotest-1.1.0.ebuild 1782 SHA256 e10ffe27c57d3b067557023fef51d76570516dc4aab66052f35a81b552769896 SHA512 6ea550c5607424f8081b8ea19abb6b7beda20952b5da5e988d0a61b04d3630eddeccb9ca88b22dfb0b9e0fe913f50f967533192cb93771e487aa2dbdad510c4c WHIRLPOOL 8a5fead5ac9611761bac0050182f15112f830dba3a0e63d0077f51a91b0567682c09a22cc0e3cf44c4b64c77e092405a5ac11f3776673acb4a7959046cf85aea
-MISC ChangeLog 734 SHA256 eeb2b758eb875fc0b685b61bad99f5ebd09dc5057ad11e6459f40fc67f15c46b SHA512 a23f0b9b7a5a86b396c62d21ad0843171c95ea853e0b2047f5d93817c67b8ffc1fa9d2f172aebc1f54614b4a33ec2e3288c0deef38eb88d3f25156af0706ee47 WHIRLPOOL 93f8435d02ae64b68c72f9e4b1d7476a661902e1f433ac36b665f846ee888906a92450525791da832396a2051a5b7ecb4d3dbfe426e30ab1e58edb4defffca1f
+EBUILD oslotest-1.1.0.ebuild 1878 SHA256 b72a357d02ee872376624f41ff532fc4f7f3ad2582548f29e7a9044674d81870 SHA512 f441b2374f3edeadef219672cbb77299250d4c9c3e122fd17c07a97594d8f98c74f874a6d001a3a63896ef72c83da94b5aaa87165f8eeb76fdc1d340f808c5aa WHIRLPOOL 5f8bc2694707e3f3b94d5456e74e7e7045cadb461f25dc29190e75a9c5e972fd5cc013e3aa83a9da13d56f123c71d781838c1562cbee012917c6c7c2e3d9249f
+MISC ChangeLog 853 SHA256 8da99ad2d4a656ea09158d2fed4f6695716ca4d099a7754696580f601b49eb3e SHA512 9f51ce5df84a336495883de508c5163effc9cadb44576cfdaff7bd8ca56f1d26d944a70b90f96018997d67d585812c20d6e1a0d0db93e57e6ff4ca055499298f WHIRLPOOL bad362a0004733f803a4038842940eabdfa132fab8d7c68a5454bc44f4531a107b5157874cae0a496b91db573df82c259ce9b7e7ae60e1b9966e436af1a1c2e1
 MISC metadata.xml 519 SHA256 b000309e6d9dac8e553b21932dedbcb76da2061b04d0d798bd7547c4c8dbd24a SHA512 4d237651e14e6e9b00781b83f9f11aa19e23ffe4fe3230c948d009a7b733fc901e0cd5729c2b241f380b4328cb6839d5d8a1ba7a42f8c075bdab94002c42a898 WHIRLPOOL 97ff487f44f4730bb2378ef67e5a611dbeb5d0de3e0142b376fb191868762398e7ad03c0a2969ed72d799ad20d650d2191a473d981df6ec138460ea8e4a3bd6f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlQmeV8ACgkQso7CE7gHKw0D1QCffqxIJWaDw4+jafBr1gp4F2HU
-LC0AoNOp6PLREytS2Li3BJE/omzdGOhR
-=Pj9+
+iF4EAREIAAYFAlQnDhMACgkQin3kvZL+ootfWgD8DeQK9OU03TK7vxqS4O7Ow5X1
+z4Lp/rvwNEnoxjdojXMA/0EcrlD/ITMgoc7b5fgUgjhEhvKsE7lmFkaCNtyrmwP/
+=UYFq
 -----END PGP SIGNATURE-----
diff --git a/dev-python/oslotest/oslotest-1.1.0.ebuild b/dev-python/oslotest/oslotest-1.1.0.ebuild
index 6e1e893a6b4b..1bff871dd053 100644
--- a/dev-python/oslotest/oslotest-1.1.0.ebuild
+++ b/dev-python/oslotest/oslotest-1.1.0.ebuild
@@ -1,59 +1,66 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/oslotest/oslotest-1.1.0.ebuild,v 1.4 2014/09/27 08:55:34 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oslotest/oslotest-1.1.0.ebuild,v 1.5 2014/09/27 19:20:47 alunduil Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3} )
+PYTHON_COMPAT=( python2_7 python3_3 )
 
 inherit distutils-r1
 
-DESCRIPTION="OpenStack test framework and test fixtures"
-HOMEPAGE="https://pypi.python.org/pypi/oslotest"
+DESCRIPTION="OpenStack test framework"
+HOMEPAGE="http://launchpad.net/oslo"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~amd64-linux ~x86 ~x86-linux"
 IUSE="doc test"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.5.21[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		test? (
-			>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-			<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-			>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-			>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-			!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-			<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-			>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		)"
-RDEPEND=">=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-0.5.21[${PYTHON_USEDEP}]
+	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
+		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+	>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+	>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+	>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+	>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+	>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
+"
 
 python_compile_all() {
 	use doc && esetup.py build_sphinx
 }
 
 python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
+	rm -rf .testrepository || die "coudln't remove '.testrepository' under ${EPYTHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
 }
 
 python_install_all() {
-	if use doc; then
-		local HTML_DOCS=( doc/build/html/. )
-		doman doc/build/man/oslotest.1
-	fi
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	use doc && doman doc/build/man/oslotest.1
 
 	distutils-r1_python_install_all
 }
 
 pkg_postinst() {
-	elog; elog "to acquire the man page, re-emerge with USE=doc"
+	elog "man page installation requires USE=doc"
 }