Replace python_test with something that actually runs tests. Restrict them until someone gets them working fully.

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

3 files changed, 46 insertions, 20 deletions

diff --git a/dev-python/django-tastypie/ChangeLog b/dev-python/django-tastypie/ChangeLog
index 4b4c187b6d33..0806f2febbfc 100644
--- a/dev-python/django-tastypie/ChangeLog
+++ b/dev-python/django-tastypie/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/django-tastypie
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-tastypie/ChangeLog,v 1.4 2013/05/29 07:56:40 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-tastypie/ChangeLog,v 1.5 2013/05/30 21:16:59 floppym Exp $
+
+  30 May 2013; Mike Gilbert <floppym@gentoo.org> django-tastypie-0.9.15.ebuild:
+  Replace python_test with something that actually runs tests. Restrict them
+  until someone gets them working fully.
 
 *django-tastypie-0.9.15 (29 May 2013)
 
diff --git a/dev-python/django-tastypie/Manifest b/dev-python/django-tastypie/Manifest
index 9b8fe36b2496..ecec2dafd59b 100644
--- a/dev-python/django-tastypie/Manifest
+++ b/dev-python/django-tastypie/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST django-tastypie-0.9.15.tar.gz 722222 SHA256 a0ac317e6b97ca152718a847729c3867a674397e5c3c335f6eed3696c8a1b016 SHA512 7a0f2ef7afe11a2b95121c7715932294cb236de65f9ba7cde4c1083a339e0790f3e3c6ecdbd70556f38baa1f23f1900e3183938aed947555b20f0d6858bb8e22 WHIRLPOOL 9bf2eed048663309e91989b85504105cf56a12dfdc5b78d43889349d7717f74779e8a40807afe155f249a63a43bb440a702129b055ba90cb27571d24c87bedd4
-EBUILD django-tastypie-0.9.15.ebuild 1745 SHA256 85ea183ffef6c0f2903a5ededf318fdf84f3a5c03607ec84d4c7711f819c0096 SHA512 43f55695308defc840d983c79da038a51509c8696e4a33b135dbf683f75f0a1c26cce44865b6cd09bb9a83db46c32ea0f2f970e39233732af9fe7149ee06381e WHIRLPOOL f47b96ec98c6f13100b039d3cb2a31b292e0ef141045dcf05e6175dc2294603c7c13152852418e9df03cf938a98549f1d78c21da68713597fcd31ca809b80a5d
-MISC ChangeLog 916 SHA256 eed58ebe18bd89b99952a62f454c71a4e84553338dcca9440d68876284ca4fb1 SHA512 6b960cc9b66c5a210c2414aad3819c1c6425f1ba2e2eca87a25873ad3741216e7c1f54497170b0ae2f33cfd2c4d4142e5509a05d1f39cb150c56a0be63e55a0c WHIRLPOOL 9eab78d3afe82cc5252d728f6019aee8cbf99b54e5e18bb7da92cd340a1da5e49736dc4e00538a3a191447c8edd58bc692ac0a8213c02f24a29c07f5946b9c2b
+DIST django-tastypie-0.9.15.tar.gz 206823 SHA256 1509d8a93d4f0e16434469c5af850d3c1c625da902b54216771cc7b25634216a SHA512 dcb26f7bb131e658ff6a2d11ca8eb74db064986cd48e536fb4987a1cfe4c4958e99f60cf173b1bbbbc051f3e55bc31ff28e645a52f526b3a98461daddd865a74 WHIRLPOOL 62503c0f05e429950b2aacdbaeacfa2cc71eee24fad9e365373fda473b7bf54e3a251ec0b3133f128436922abc4ed8182f7405eb4a62e1a40628b2b44b596243
+EBUILD django-tastypie-0.9.15.ebuild 2286 SHA256 629883e8e086b777fe845d4de62759dbcfe302b9b5778b4955e1f3f26db28f8c SHA512 056ccb6c893a49d9cbbc739dc83577f852b873be04d92aa6d38d118ae378cdf1f5a223fa07f110c68a6843e569ba35be8d105d90b2064487faf4d6e79c1b745c WHIRLPOOL c6def94897228659e01cbafbe3b58082877e395da114b2a8f2dfc2a534d5614054615bcaf67216a84075a4c9b76038a1cea9fd9c5f41cda4c5b93c6691ac1c6c
+MISC ChangeLog 1115 SHA256 2cc5a69e428f7922867cfed43b08a5c048466076238aa07d8be9709bf9f2b292 SHA512 5a9e6ee2dc3564b2fed1e2ed50a7d2e388e50802a42066e2905f534fb6666dc661560d31727c67dce4879580e08ed3c8ec4c9a0637ef362646163644874ddad6 WHIRLPOOL 6026181135958046c947ed6e08a77d50eb056d1e78c5f83079b4a4728fa04e6cb7c12b9e7d53b28ee42b162e101fb2079928fbfd77b802819d7460ee6cb1df07
 MISC metadata.xml 617 SHA256 2808af8cf89afeddf9e27aed0fe11fc8a541cc3dc570790bd944f5ee4cc01bbf SHA512 e16b7d49c14232fe6a16b5869027fe3b9bf5b8cc9a27e3b8aea80565fa2d0b8fd8bb0badf90774c288b2b7a8b63acd869e120a9fd658f81acbaf459eb00fc308 WHIRLPOOL 51e1929cada3f50cfcaaa023aa87346b7d9e5ce9caa33a6c4b7ff3a814725a97d954f8b72f89a8c2cb88690e7eb628f3d97fe2099fc820cee5f3c2ccb9d7a408
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlGltMYACgkQso7CE7gHKw2fbwCglIGK82SdkPGcNw03u7mt+3Fk
-b80An3WJTKfIvpsSbGi+DX385cUgSxnG
-=J1Rs
+iF4EAREIAAYFAlGnwdAACgkQC77qH+pIQ6QZxwEAu4sO3b2QxUwEPKq/v9hpXmYE
+MCwbutzVrX2yupcqTJMA/29PvCSr6QWlkDJ8vu8VKNAa7fmdjnuwA70Mp+bTbDd8
+=zecV
 -----END PGP SIGNATURE-----
diff --git a/dev-python/django-tastypie/django-tastypie-0.9.15.ebuild b/dev-python/django-tastypie/django-tastypie-0.9.15.ebuild
index 65214d04c219..2a8ee077c16f 100644
--- a/dev-python/django-tastypie/django-tastypie-0.9.15.ebuild
+++ b/dev-python/django-tastypie/django-tastypie-0.9.15.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/dev-python/django-tastypie/django-tastypie-0.9.15.ebuild,v 1.1 2013/05/29 07:56:40 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-tastypie/django-tastypie-0.9.15.ebuild,v 1.2 2013/05/30 21:16:59 floppym Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -9,7 +9,7 @@ inherit distutils-r1
 
 DESCRIPTION="A flexible and capable API layer for django utilising serialisers"
 HOMEPAGE="http://pypi.python.org/pypi/django-tastypie/ https://github.com/toastdriven/django-tastypie"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/toastdriven/django-tastypie/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~amd64 ~x86"
 IUSE="bip doc digest lxml oauth test yaml"
 
@@ -25,24 +25,46 @@ RDEPEND=">=dev-python/mimeparse-0.1.3[${PYTHON_USEDEP}]
 	oauth? ( dev-python/oauth2[${PYTHON_USEDEP}] dev-python/django-oauth-plus[${PYTHON_USEDEP}] )
 	lxml? ( dev-python/lxml[${PYTHON_USEDEP}] )
 	yaml? ( dev-python/pyyaml[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND} >=dev-python/django-1.2.5[${PYTHON_USEDEP}]
+DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+	test? (
+		dev-python/django-oauth-plus[${PYTHON_USEDEP}]
+		dev-python/oauth2[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/python-digest[${PYTHON_USEDEP}]
+		dev-python/biplist[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		>=dev-python/mimeparse-0.1.3[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+RESTRICT="test"
 
 python_compile_all() {
 	use doc && emake -C docs html
 }
 
+src_test() {
+	DISTUTILS_NO_PARALLEL_BUILD=1 distutils-r1_src_test
+}
+
 python_test() {
-	export DJANGO_SETTINGS_MODULE="django.conf"
-	export SECRET_KEY='green'
-	if ! "${PYTHON}" -c \
-		"from django.conf import global_settings;global_settings.SECRET_KEY='$SECRET_KEY'" \
-		-m tastypie.test; then
-		die "test ${test} failed under ${EPYTHON}"
-	else
-		einfo "test ${test} passed under ${EPYTHON}"
-	fi
+	# See tests/run_all_tests.sh
+	local types=( core basic alphanumeric slashless namespaced related
+		validation gis content_gfk authorization )
+	local failed type
+
+	pushd tests > /dev/null || die
+	for type in "${types[@]}"; do
+		set -- django-admin.py test ${type} --settings=settings_${type}
+		echo "$@"
+		"$@" || failed=1
+	done
+	popd > /dev/null || die
+
+	[[ -z ${failed} ]] || die "Testing failed with ${EPYTHON}"
 }
 
 python_install_all() {