dev-python/sclapp: Integrate testsuite patch

Package-Manager: portage-2.2_rc54/cvs/Linux i686

4 files changed, 50 insertions, 17 deletions

diff --git a/dev-python/sclapp/ChangeLog b/dev-python/sclapp/ChangeLog
index 51febfe80299..7482699d9963 100644
--- a/dev-python/sclapp/ChangeLog
+++ b/dev-python/sclapp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/sclapp
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sclapp/ChangeLog,v 1.2 2009/12/20 21:44:57 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sclapp/ChangeLog,v 1.3 2009/12/21 17:18:41 sping Exp $
+
+  21 Dec 2009; Sebastian Pipping <sping@gentoo.org> sclapp-0.5.3.ebuild,
+  +files/sclapp-0.5.3-testsuite-fix-from-r235.patch:
+  Integrate fresh testsuite patch from upstream revision 235
 
   20 Dec 2009; Torsten Veller <tove@gentoo.org> metadata.xml:
   Fix metadata: maintainer-wanted herd does not exist
diff --git a/dev-python/sclapp/Manifest b/dev-python/sclapp/Manifest
index c8aa4077bea9..00c7204db867 100644
--- a/dev-python/sclapp/Manifest
+++ b/dev-python/sclapp/Manifest
@@ -1,14 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX sclapp-0.5.3-testsuite-fix-from-r235.patch 1276 RMD160 d943dc4900af5235a4f9454ebecaf00012f9a3ca SHA1 cedc4f8227cf154494988477797ad1c0f8809938 SHA256 01a844e9462fa252ab179655b2881a36bb4e25a36b225544725b9eb881e41750
 DIST sclapp-0.5.3.tar.gz 47646 RMD160 b5c16a5abed9be7c608427acb5e31028c29c3e5d SHA1 bc5f96438819cd6b11db14997878e07c2b0d7811 SHA256 e8e8b60cea9b09acc08f237e92c8b86057bdfd735412aa88cc993fea29031768
-EBUILD sclapp-0.5.3.ebuild 916 RMD160 26764f2e9a45df036df02c02f4139591d3fb45c1 SHA1 fb24a8573ea790cbaffea97d255849c7c6524d6d SHA256 22d50c0e894c382f9992dee9a3b6ae7878922ebdcb4f31016fb824b3a9a07fc8
-MISC ChangeLog 493 RMD160 4b2ba89973baf09d815f89bc7e642e1496a9cbc5 SHA1 427868fc0db0801483d8ca0ae13a395da1993f61 SHA256 8e7958e44ca1b5afb67247acc61a17b4e41a5f0d3b392a075215471d4720c012
+EBUILD sclapp-0.5.3.ebuild 810 RMD160 a3bfdf806ade2b92e9e4f1a3678d1aa7cdb2e027 SHA1 ae948c9209dccc2e662aac97ced622138f6c885b SHA256 4f560f76fb3dd899b0128b23cb0de2829d3dac16d209c8765c8e3029df4a9686
+MISC ChangeLog 682 RMD160 8e6388482f42ef27f868691aa7eabce77d841eeb SHA1 05819a5e0c73ed188c421dcb24a0050acf383a42 SHA256 8c960965e91e7b205862462eaebc4232a870da20b8fb55e96125cf6775b102dd
 MISC metadata.xml 257 RMD160 04e4c6e678ba8e8ffde93f57d06a40b60f9eaa69 SHA1 e3c39bf9a25beebbe626726bb94f6e22db4fa06d SHA256 b4a209de2bfbbcc5ceab61bf458a1ee79da4c60a30e4aabf54b76e9709b56db8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAksumt8ACgkQV3J2n04EauziLwCeOW1EnSusPZ8HeIMicypSPAKX
-04AAmweKrJu6TYFgnETu1alW5t65ATs6
-=uPO6
------END PGP SIGNATURE-----
diff --git a/dev-python/sclapp/files/sclapp-0.5.3-testsuite-fix-from-r235.patch b/dev-python/sclapp/files/sclapp-0.5.3-testsuite-fix-from-r235.patch
new file mode 100644
index 000000000000..45965f01b1de
--- /dev/null
+++ b/dev-python/sclapp/files/sclapp-0.5.3-testsuite-fix-from-r235.patch
@@ -0,0 +1,40 @@
+=== modified file 'NEWS'
+--- NEWS	2009-01-14 11:11:28 +0000
++++ NEWS	2009-12-21 14:12:02 +0000
+@@ -25,6 +25,9 @@
+ 
+    (Forest Bond)
+ 
++ * Fixed output protection test that was failing on some systems.
++   (Forest Bond)
++
+ 
+ sclapp 0.5.3 2008-07-21
+ =======================
+
+=== modified file 'tests/output_protection.py'
+--- tests/output_protection.py	2008-05-18 21:46:03 +0000
++++ tests/output_protection.py	2009-12-21 14:12:02 +0000
+@@ -109,8 +109,10 @@
+   exceptions = ()):
+     def test_fn():
+         pid = failure_fn(main_fn)
+-        assertLogFileContainsExactly('foo', foos)
+-        assertLogFileContainsExactly('bar', bars)
++        if foos is not None:
++            assertLogFileContainsExactly('foo', foos)
++        if bars is not None:
++            assertLogFileContainsExactly('bar', bars)
+         for signal in signals:
+             assertSignalCaught(signal, pid)
+         for exception in exceptions:
+@@ -171,7 +173,7 @@
+         'test_stdout_fails_without_signal_handling_without_output_protection',
+         _stdout_fails,
+         main_without_signal_handling_without_output_protection,
+-        2, 2, ()
++        2, None, ()
+     )))
+     test_stdout_stderr_fail_without_signal_handling_without_output_protection = (
+       staticmethod(_make_test_fn(
+
diff --git a/dev-python/sclapp/sclapp-0.5.3.ebuild b/dev-python/sclapp/sclapp-0.5.3.ebuild
index b65485fccc5f..8c705d594acb 100644
--- a/dev-python/sclapp/sclapp-0.5.3.ebuild
+++ b/dev-python/sclapp/sclapp-0.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sclapp/sclapp-0.5.3.ebuild,v 1.1 2009/12/20 20:43:41 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sclapp/sclapp-0.5.3.ebuild,v 1.2 2009/12/21 17:18:41 sping Exp $
 
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"
@@ -21,9 +21,7 @@ RDEPEND=""
 RESTRICT_PYTHON_ABIS="3.*"
 
 src_prepare() {
-	# Disable failing test
-	sed -e "s/test_stdout_fails_without_signal_handling_without_output_protection/_&/" \
-			-i tests/output_protection.py || die "sed failed"
+	epatch "${FILESDIR}/${P}-testsuite-fix-from-r235.patch"
 }
 
 src_test() {