test phase fixed again, upstream provided (an unexpected) fix in tracker issues#74

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

3 files changed, 45 insertions, 8 deletions

diff --git a/dev-python/traitsui/ChangeLog b/dev-python/traitsui/ChangeLog
index 1673c0762632..bbc674c615f1 100644
--- a/dev-python/traitsui/ChangeLog
+++ b/dev-python/traitsui/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/traitsui
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/traitsui/ChangeLog,v 1.7 2013/04/11 18:45:34 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/traitsui/ChangeLog,v 1.8 2013/04/12 05:51:09 idella4 Exp $
+
+  12 Apr 2013; Ian Delaney <idella4@gentoo.org>
+  +files/traitsui-4.3.0-tests.patch, traitsui-4.3.0-r1.ebuild:
+  test phase fixed again, upstream provided (an unexpected) fix in tracker
+  issues#74
 
 *traitsui-4.3.0-r1 (11 Apr 2013)
 
diff --git a/dev-python/traitsui/files/traitsui-4.3.0-tests.patch b/dev-python/traitsui/files/traitsui-4.3.0-tests.patch
new file mode 100644
index 000000000000..2712203dfb57
--- /dev/null
+++ b/dev-python/traitsui/files/traitsui-4.3.0-tests.patch
@@ -0,0 +1,34 @@
+https://github.com/enthought/traitsui/issues/74
+diff -ur traitsui-4.3.0.orig/traitsui/qt4/ui_panel.py traitsui-4.3.0/traitsui/qt4/ui_panel.py
+--- traitsui/qt4/ui_panel.py	2013-03-29 04:08:54.000000000 +0800
++++ traitsui/qt4/ui_panel.py	2013-04-12 13:23:09.499989912 +0800
+@@ -977,7 +977,7 @@
+ 
+         if (label is not None
+             and not is_label_left
+-            and item_policy == QtGui.QSizePolicy.Policy.Minimum):
++            and item_policy == QtGui.QSizePolicy.Minimum):
+             # this item cannot be stretched horizontally, and the label
+             # exists and is on the right -> make label stretchable if necessary
+ 
+@@ -1012,7 +1012,7 @@
+         label_policy = label.sizePolicy()
+         label_policy.setHorizontalStretch(stretch)
+         label_policy.setHorizontalPolicy(
+-            QtGui.QSizePolicy.Policy.Expanding)
++            QtGui.QSizePolicy.Expanding)
+         label.setSizePolicy(label_policy)
+ 
+ 
+diff -ur traitsui-4.3.0.orig/traitsui/tests/_tools.py traitsui-4.3.0/traitsui/tests/_tools.py
+--- traitsui/tests/_tools.py	2013-03-29 04:08:54.000000000 +0800
++++ traitsui/tests/_tools.py	2013-04-12 13:23:09.502989914 +0800
+@@ -173,7 +173,7 @@
+         return ui_control.GetSizeTuple()
+ 
+     elif is_current_backend_qt4():
+-        return ui_control.size().toTuple()
++        return ui_control.size().width(), ui_control.size().height()
+ 
+ 
+ # ######### Debug tools
diff --git a/dev-python/traitsui/traitsui-4.3.0-r1.ebuild b/dev-python/traitsui/traitsui-4.3.0-r1.ebuild
index 32bbd2b33441..8673c0193746 100644
--- a/dev-python/traitsui/traitsui-4.3.0-r1.ebuild
+++ b/dev-python/traitsui/traitsui-4.3.0-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/dev-python/traitsui/traitsui-4.3.0-r1.ebuild,v 1.1 2013/04/11 18:45:34 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/traitsui/traitsui-4.3.0-r1.ebuild,v 1.2 2013/04/12 05:51:09 idella4 Exp $
 
 EAPI=5
 
@@ -29,19 +29,17 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 
 DOCS=( docs/traitsuidocreadme.txt )
 
+PATCHES=( "${FILESDIR}"/${P}-tests.patch )
+
 python_compile_all() {
 	use doc && emake -C docs html
 }
 
 python_test() {
-	# https://github.com/enthought/traitsui/issues/74; 
-	# upstream can't be relied upon to fix, unpassable tests here excluded
 	export ETS_TOOLKIT=qt4
 	export QT_API=pyqt
-	VIRTUALX_COMMAND="nosetests -e test_qt_show_labels_right_without_colon* \
-		-e test_qt_labels_right_resizing_vertical* \
-		-e test_visible_when_layout* \
-		-e test_qt_labels_right_resizing_horizontal*" virtualmake
+	VIRTUALX_COMMAND="nosetests -v" virtualmake
+
 }
 
 python_install_all() {