Unrestrict tests.

(Portage version: HEAD/cvs/Linux x86_64)

2 files changed, 33 insertions, 14 deletions

diff --git a/dev-python/apptools/ChangeLog b/dev-python/apptools/ChangeLog
index c6a620088319..4451a4e9cea1 100644
--- a/dev-python/apptools/ChangeLog
+++ b/dev-python/apptools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/apptools
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/apptools/ChangeLog,v 1.7 2010/05/31 07:00:30 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/apptools/ChangeLog,v 1.8 2010/07/07 16:56:27 arfrever Exp $
+
+  07 Jul 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  apptools-3.3.2.ebuild:
+  Unrestrict tests.
 
 *apptools-3.3.2 (31 May 2010)
 
diff --git a/dev-python/apptools/apptools-3.3.2.ebuild b/dev-python/apptools/apptools-3.3.2.ebuild
index 9c5c910a66a4..0ea0ac8c4f0d 100644
--- a/dev-python/apptools/apptools-3.3.2.ebuild
+++ b/dev-python/apptools/apptools-3.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/apptools/apptools-3.3.2.ebuild,v 1.2 2010/07/07 03:50:18 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/apptools/apptools-3.3.2.ebuild,v 1.3 2010/07/07 16:56:27 arfrever Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -8,7 +8,7 @@ SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.*"
 DISTUTILS_SRC_TEST="setup.py"
 
-inherit distutils
+inherit distutils virtualx
 
 MY_PN="AppTools"
 MY_P="${MY_PN}-${PV}"
@@ -17,40 +17,55 @@ DESCRIPTION="Enthought Tool Suite application tools"
 HOMEPAGE="http://code.enthought.com/projects/app_tools.php http://pypi.python.org/pypi/AppTools"
 SRC_URI="http://www.enthought.com/repo/ETS/${MY_P}.tar.gz"
 
-IUSE="doc examples"
-#IUSE="doc examples test"
+LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-LICENSE="BSD"
+IUSE="doc examples test"
 
 RDEPEND="dev-python/configobj
-	dev-python/numpy
+	>=dev-python/enthoughtbase-3.0.5
 	>=dev-python/envisagecore-3.1.2
+	dev-python/numpy
 	>=dev-python/traitsgui-3.4.0"
 DEPEND="dev-python/setuptools
-	doc? ( dev-python/setupdocs )"
-# Tests require X display.
-#	test? ( >=dev-python/nose-0.10.3
-#			>=dev-python/enthoughtbase-3.0.4 )
-RESTRICT="test"
+	doc? ( dev-python/setupdocs )
+	test? (
+		dev-python/coverage
+		>=dev-python/nose-0.10.3
+		media-fonts/font-cursor-misc
+		media-fonts/font-misc-misc
+		x11-apps/xhost
+	)"
 
 S="${WORKDIR}/${MY_P}"
+
 PYTHON_MODNAME="enthought integrationtests"
 
 src_prepare() {
 	sed -i \
 		-e "s/self.run_command('build_docs')/pass/" \
-		-e "s/setupdocs>=1.0//" \
-		setup.py || die
+		-e "/setupdocs>=1.0/d" \
+		setup.py || die "sed setup.py failed"
+
+	# Disable failing tests.
+	sed -e "s/test_version_registry/_&/" -i enthought/persistence/tests/test_spawner.py
+	sed -e "s/test_run/_&/" -i enthought/persistence/tests/test_version_registry.py
+	rm -f enthought/persistence/tests/test_state_pickler.py
 }
 
 src_compile() {
 	distutils_src_compile
+
 	if use doc; then
+		einfo "Generation of documentation"
 		"$(PYTHON -f)" setup.py build_docs --formats=html,pdf || die "Generation of documentation failed"
 	fi
 }
 
+src_test() {
+	maketype="distutils_src_test" virtualmake
+}
+
 src_install() {
 	find "${S}" -name "*LICENSE.txt" -delete
 	distutils_src_install