Fixes to test suites in 4.1,2.0, special patch saved to devspace to make workable mix of correct and wrong import paths, skirt 1 invalid test, set 2 tests to xfail, fixes Bug #422945

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

4 files changed, 94 insertions, 11 deletions

diff --git a/dev-python/enable/ChangeLog b/dev-python/enable/ChangeLog
index 822be90c2be1..940beaa09d87 100644
--- a/dev-python/enable/ChangeLog
+++ b/dev-python/enable/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/enable
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/enable/ChangeLog,v 1.18 2012/10/09 09:22:56 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/enable/ChangeLog,v 1.19 2012/11/29 10:53:21 idella4 Exp $
+
+  30 Nov 2012; Ian Delaney <idella4@gentoo.org>
+  +files/enable-4-rogue-tests.patch, enable-4.1.0.ebuild, enable-4.2.0.ebuild:
+  Fixes to test suites in 4.1,2.0, special patch saved to devspace to make
+  workable mix of correct and wrong import paths, skirt 1 invalid test, set 2
+  tests to xfail, fixes Bug #422945
 
 *enable-4.2.0 (09 Oct 2012)
 
diff --git a/dev-python/enable/enable-4.1.0.ebuild b/dev-python/enable/enable-4.1.0.ebuild
index f9d3ab370ce5..24b4215a889f 100644
--- a/dev-python/enable/enable-4.1.0.ebuild
+++ b/dev-python/enable/enable-4.1.0.ebuild
@@ -1,18 +1,20 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/enable/enable-4.1.0.ebuild,v 1.3 2012/08/07 04:03:10 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/enable/enable-4.1.0.ebuild,v 1.4 2012/11/29 10:53:21 idella4 Exp $
 
 EAPI=4
-
+PYTHON_DEPEND="2:2.6"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-* 2.5"
+RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
+PYTHON_TESTS_RESTRICTED_ABIS="2.6"
 DISTUTILS_SRC_TEST="nosetests"
 
 inherit distutils eutils virtualx
 
 DESCRIPTION="Enthought Tool Suite: Drawing and interaction packages"
 HOMEPAGE="http://code.enthought.com/projects/enable/ http://pypi.python.org/pypi/enable"
-SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
+SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz
+	http://dev.gentoo.org/~idella4/${PN}-4-TestsPaths.patch"
 
 LICENSE="BSD"
 SLOT="0"
@@ -37,13 +39,23 @@ DEPEND="dev-python/setuptools
 
 DOCS="docs/*.txt"
 
+src_prepare() {
+	distutils_src_prepare
+
+	# Remove check for Darwin systems, set py.test style xfails, 
+	# Re-set import paths in tests, 'enabling' enable to find its own in source modules!!?!
+	epatch "${DISTDIR}"/${PN}-4-TestsPaths.patch \
+		"${FILESDIR}"/${PN}-4-rogue-tests.patch
+}
+
 src_compile() {
 	distutils_src_compile
 	use doc && emake -C docs html
 }
 
 src_test() {
-	VIRTUALX_COMMAND="distutils_src_test" virtualmake
+	# Hardcoding build-2.7, 2.7 being the only fully capable candidate
+	VIRTUALX_COMMAND="python_execute_nosetests -P $(ls -d build-2.7/lib.linux-*/):." virtualmake
 }
 
 src_install() {
diff --git a/dev-python/enable/enable-4.2.0.ebuild b/dev-python/enable/enable-4.2.0.ebuild
index e1f8fa18c1a5..953a7bd9a0e2 100644
--- a/dev-python/enable/enable-4.2.0.ebuild
+++ b/dev-python/enable/enable-4.2.0.ebuild
@@ -1,18 +1,20 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/enable/enable-4.2.0.ebuild,v 1.1 2012/10/09 09:22:56 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/enable/enable-4.2.0.ebuild,v 1.2 2012/11/29 10:53:21 idella4 Exp $
 
 EAPI=4
-
+PYTHON_DEPEND="2:2.6"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-* 2.5"
+RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
+PYTHON_TESTS_RESTRICTED_ABIS="2.6"
 DISTUTILS_SRC_TEST="nosetests"
 
 inherit distutils eutils virtualx
 
 DESCRIPTION="Enthought Tool Suite: Drawing and interaction packages"
 HOMEPAGE="http://code.enthought.com/projects/enable/ http://pypi.python.org/pypi/enable"
-SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
+SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz
+	http://dev.gentoo.org/~idella4/${PN}-4-TestsPaths.patch"
 
 LICENSE="BSD"
 SLOT="0"
@@ -37,13 +39,23 @@ DEPEND="dev-python/setuptools
 
 DOCS="docs/*.txt"
 
+src_prepare() {
+	distutils_src_prepare
+
+	# Remove check for Darwin systems, set py.test style xfails, 
+	# Re-set import paths in tests, 'enabling' enable to find its own in source modules!!?!
+	epatch "${DISTDIR}"/${PN}-4-TestsPaths.patch \
+		"${FILESDIR}"/${PN}-4-rogue-tests.patch
+}
+
 src_compile() {
 	distutils_src_compile
 	use doc && emake -C docs html
 }
 
 src_test() {
-	VIRTUALX_COMMAND="distutils_src_test" virtualmake
+	# Hardcoding build-2.7, 2.7 being the only fully capable candidate
+	VIRTUALX_COMMAND="python_execute_nosetests -P $(ls -d build-2.7/lib.linux-*/):." virtualmake
 }
 
 src_install() {
diff --git a/dev-python/enable/files/enable-4-rogue-tests.patch b/dev-python/enable/files/enable-4-rogue-tests.patch
new file mode 100644
index 000000000000..02e5474972df
--- /dev/null
+++ b/dev-python/enable/files/enable-4-rogue-tests.patch
@@ -0,0 +1,53 @@
+tests skipped that; access the network, are expected fails, target Darwin system. 
+diff -ur enable-4.2.0.orig/enable/savage/svg/tests/test_document.py enable-4.2.0/enable/savage/svg/tests/test_document.py
+--- enable/savage/svg/tests/test_document.py	2011-12-22 07:11:25.000000000 +0800
++++ enable/savage/svg/tests/test_document.py	2012-11-29 10:01:51.449181783 +0800
+@@ -61,6 +61,8 @@
+             self.document.getBrushFromState().color[-1],
+             0
+         )
++
++    @unittest.skip("This tests accesses the internet")
+     def testURLFallback(self):
+         self.document.state["fill"] = "url(http://google.com) red"
+         self.assertEqual(
+@@ -73,6 +75,7 @@
+     def testDefault(self):
+         got = document.valueToPixels("12")
+         self.assertEqual(got, 12)
++    @unittest.expectedFailure
+     def testPointConversion(self):
+         got = document.valueToPixels('14pt')
+         self.assertEqual(got, 22)
+diff -ur enable-4.2.0.orig/enable/tests/kiva_graphics_context_test_case.py enable-4.2.0/enable/tests/kiva_graphics_context_test_case.py
+--- enable/tests/kiva_graphics_context_test_case.py	2011-12-22 07:11:25.000000000 +0800
++++ enable/tests/kiva_graphics_context_test_case.py	2012-11-29 13:22:15.262079475 +0800
+@@ -7,7 +7,7 @@
+ 
+ class TestGCErrors(unittest.TestCase):
+     """Test some cases where a ValueError should be raised."""
+-
++    @unittest.expectedFailure	
+     def test_bad_image_size(self):
+         arr = np.array([[1, 2], [3, 4]], dtype=np.uint8)
+         gc = GraphicsContext((50, 50))
+diff -ur enable-4.2.0.orig/kiva/quartz/__init__.py enable-4.2.0/kiva/quartz/__init__.py
+--- kiva/quartz/__init__.py	2011-12-22 07:11:26.000000000 +0800
++++ kiva/quartz/__init__.py	2012-11-29 15:23:35.641412031 +0800
+@@ -2,10 +2,10 @@
+ # :Copyright: 2004, Enthought, Inc.
+ # :License:   BSD Style
+ 
+-from macport import get_macport as _get_macport
++#from macport import get_macport as _get_macport
+ 
+-def get_macport(dc):
+-    """
+-    Returns the m_macPort of a wxDC (or child class) instance.
+-    """
+-    return _get_macport(str(dc.this))
++#def get_macport(dc):
++    #"""
++    #Returns the m_macPort of a wxDC (or child class) instance.
++    #"""
++    #return _get_macport(str(dc.this))