Make the process tests work on a slower or loaded cpu, thanks to gustavoz for reporting.

(Portage version: 2.1_pre7-r3)

8 files changed, 81 insertions, 27 deletions

diff --git a/dev-python/twisted/ChangeLog b/dev-python/twisted/ChangeLog
index b23f7c854106..7131779221ac 100644
--- a/dev-python/twisted/ChangeLog
+++ b/dev-python/twisted/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/twisted
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/ChangeLog,v 1.61 2006/02/13 23:49:21 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/ChangeLog,v 1.62 2006/04/03 21:16:14 marienz Exp $
+
+  03 Apr 2006; Marien Zwart <marienz@gentoo.org>
+  +files/twisted-2.0.1-echo-less.patch,
+  +files/twisted-2.1.0-echo-less.patch, twisted-2.0.1.ebuild,
+  twisted-2.1.0.ebuild, twisted-2.2.0.ebuild:
+  Make the process tests work on a slower or loaded cpu, thanks to gustavoz
+  for reporting.
 
   13 Feb 2006; Marien Zwart <marienz@gentoo.org> twisted-2.2.0.ebuild:
   Fix minimal python requirement.
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
index 15ec2a3b6d7c..f922f54ff062 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 6038b46b48047bf04c081a666dfb0386 ChangeLog 11724
 RMD160 42fa7127080a489ba8c1c652c76491598c29952a ChangeLog 11724
 SHA256 6493a3bbfcc938334e9e425e9bc8622f319ceda9af5edbf7d2cd1069fa44b665 ChangeLog 11724
@@ -10,9 +7,9 @@ SHA256 642c76cdb39a453babb98695aed3964ff25cf2f26dce55598e976b799f927149 files/di
 MD5 387f6df81a68c591e6f30fe8878d964b files/digest-twisted-1.3.0 74
 RMD160 c7d222b7e715a650fa11d2b98ccff4d8ba26e701 files/digest-twisted-1.3.0 74
 SHA256 38497fe8d7fea068929208838dc2fd189b5fc172b6449b7ae0fa986f746059fd files/digest-twisted-1.3.0 74
-MD5 1d3126a7c14d292951e51397db90bc83 files/digest-twisted-2.0.1 67
-RMD160 82e7e057b3d815cdb19ca0c337296eb150855303 files/digest-twisted-2.0.1 67
-SHA256 7c64aad689e66d0c5d2a61941ae747c7707eaec77d217d61877c3f9d31c7f300 files/digest-twisted-2.0.1 67
+MD5 c1f673be73ccbfbd3605c6e502d238db files/digest-twisted-2.0.1 247
+RMD160 7d6a9a0376f89291a39be221b34e96fcbb5fe779 files/digest-twisted-2.0.1 247
+SHA256 2cb3424bcfeca56e18b71c0239f3d43d41ea34ce856632acd9431e37640de198 files/digest-twisted-2.0.1 247
 MD5 f31de6220dc1b05c4ae5e7d0e4bb06bc files/digest-twisted-2.1.0 247
 RMD160 42077382825c92fc5e929bdb19a1452dfdf9318d files/digest-twisted-2.1.0 247
 SHA256 176d9d35264027ca7dcf72b0d34df0ecaa03d577138f9ce1b73bd436ce657fa2 files/digest-twisted-2.1.0 247
@@ -25,6 +22,12 @@ SHA256 aa2ffa5b128973bc0c58a1251b8bbb56f6f890728bc902805ea2db7606416119 files/tw
 MD5 ca8f49d9aaa78d3814f75d8d2d861469 files/twistd.init 545
 RMD160 b77acc9468cd619e9af334c8a36ed3f9bb003494 files/twistd.init 545
 SHA256 c0aead865bee1fa7d88f2a59f936718621a9b52b1b623ae9e599f1226d8a0dc1 files/twistd.init 545
+MD5 371ca0d01700f9c4501da2b3dedc99ce files/twisted-2.0.1-echo-less.patch 527
+RMD160 c0a4f923a4bde04a1df183878b4c1414fad98b41 files/twisted-2.0.1-echo-less.patch 527
+SHA256 28d3a8ede3d30744c411dc86978f17601867e6e999d79e77527981b8ddb6fa49 files/twisted-2.0.1-echo-less.patch 527
+MD5 475315a298b24f292635829059a60c15 files/twisted-2.1.0-echo-less.patch 269
+RMD160 c7fd9d87325a453ce9215591fc296b4b31505369 files/twisted-2.1.0-echo-less.patch 269
+SHA256 1f190151c00c37dc5055f9b2b1dd7b0943523f29d57f78d5ca5f57723e3d9705 files/twisted-2.1.0-echo-less.patch 269
 MD5 10037b0c00b3a023d4a4330b82731cc6 files/twisted-2.1.0-trial-tests.patch 12253
 RMD160 75d31c9095f4699a1af9c96679df8f1765fee2aa files/twisted-2.1.0-trial-tests.patch 12253
 SHA256 c1a94192554d9478a904ad6069eba9ef1633455c1a7fa60b278bdd743a797691 files/twisted-2.1.0-trial-tests.patch 12253
@@ -43,19 +46,12 @@ SHA256 800994ba7f45c4b98f248b7ccdec4b0625bfd4314c88fd8897132d8e93758d0d twisted-
 MD5 bf95b063077d70c2e46a438421082ae4 twisted-1.3.0.ebuild 1061
 RMD160 fa6ac04c275dec8e5ddf2b2e6fea7d4217d495ca twisted-1.3.0.ebuild 1061
 SHA256 f597d5d3ea67e9ea8a297cb1b4b4448e18b29532ba97e3744c10bc8e897c5575 twisted-1.3.0.ebuild 1061
-MD5 fbfc15c63ae380af8cc2ee3a1feab83a twisted-2.0.1.ebuild 2840
-RMD160 88ad2698697638335da517d54355ade835ab6a70 twisted-2.0.1.ebuild 2840
-SHA256 1ff2d9ba4f1b641ea22269c72801b72581ad35479808d6755aea2caac25a9638 twisted-2.0.1.ebuild 2840
-MD5 594fb659773dc51c1f0c8b03a4f24e90 twisted-2.1.0.ebuild 3044
-RMD160 aa9f70996d8c2b2797e7f80e643277b04ad4bbc9 twisted-2.1.0.ebuild 3044
-SHA256 46ad17bb5d27d534e9b5d5d43c24c4840e6e987dac5fbee4d2547f497e87582a twisted-2.1.0.ebuild 3044
-MD5 a32eb541ad8ddb37d6c320b7678acc76 twisted-2.2.0.ebuild 2959
-RMD160 64fd5bd6dc3b7e4e389ddb724f9a9c5056180614 twisted-2.2.0.ebuild 2959
-SHA256 4fe60c8c01224e0113f87aa591d477f1d824a1838c2803328862f53ad70f15ae twisted-2.2.0.ebuild 2959
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD8RsSW78445TWHXcRAvpTAKCTZux0JMQUfr9Sp889UsEUbAzYEwCgj4aC
-jvGi0pQfTBrLpLYNv2BoCEc=
-=HpGe
------END PGP SIGNATURE-----
+MD5 bdab5d3fa68963471e4204b5e7388f58 twisted-2.0.1.ebuild 2985
+RMD160 a540b591271dde14c432908cfba3151755609ce7 twisted-2.0.1.ebuild 2985
+SHA256 5f38106bce8cd0ff5d6316af1679c15a5b652178948868cb1f6b7b804e533423 twisted-2.0.1.ebuild 2985
+MD5 62302428aa95a61e19e773cc1f1ef6ca twisted-2.1.0.ebuild 3147
+RMD160 c850692ba540e153b4d2ae16ef2ad545192297de twisted-2.1.0.ebuild 3147
+SHA256 99ef6b6c458797401e876a5879eaf1d831aab75f9dee1fc352508d22bc5355ee twisted-2.1.0.ebuild 3147
+MD5 5d6910a5686d47bca4d872d65c0002ea twisted-2.2.0.ebuild 3138
+RMD160 1344ea58d66284af07e5c5b7aab02b358652177b twisted-2.2.0.ebuild 3138
+SHA256 0da22ead5a2ec891de029d70ac479c4a76e01be199756dd0e1c922ab2f168d3f twisted-2.2.0.ebuild 3138
diff --git a/dev-python/twisted/files/digest-twisted-2.0.1 b/dev-python/twisted/files/digest-twisted-2.0.1
index 841c022999ed..8bb69919ebb7 100644
--- a/dev-python/twisted/files/digest-twisted-2.0.1
+++ b/dev-python/twisted/files/digest-twisted-2.0.1
@@ -1 +1,3 @@
 MD5 6cf0ebb84731f8c2c45ea125efda77fe Twisted-2.0.1.tar.bz2 1061899
+RMD160 e67033a2a936d2252c7e039bfc41d4f74012a6ef Twisted-2.0.1.tar.bz2 1061899
+SHA256 78d0908db2933de8f78db564ec5f035c0a171e19d8f6a375d4164f8422c29c09 Twisted-2.0.1.tar.bz2 1061899
diff --git a/dev-python/twisted/files/twisted-2.0.1-echo-less.patch b/dev-python/twisted/files/twisted-2.0.1-echo-less.patch
new file mode 100644
index 000000000000..de366669ed68
--- /dev/null
+++ b/dev-python/twisted/files/twisted-2.0.1-echo-less.patch
@@ -0,0 +1,22 @@
+=== modified file 'twisted/test/test_process.py'
+--- twisted/test/test_process.py	
++++ twisted/test/test_process.py	
+@@ -76,7 +76,7 @@
+ 
+ class EchoProtocol(protocol.ProcessProtocol):
+ 
+-    s = "1234567" * 1001
++    s = "1234567" * 11
+     finished = 0
+ 
+     def connectionMade(self):
+@@ -86,7 +86,7 @@
+ 
+     def outReceived(self, data):
+         self.buffer += data
+-        if len(self.buffer) == 70070:
++        if len(self.buffer) == 770:
+             self.transport.closeStdin()
+ 
+     def processEnded(self, reason):
+
diff --git a/dev-python/twisted/files/twisted-2.1.0-echo-less.patch b/dev-python/twisted/files/twisted-2.1.0-echo-less.patch
new file mode 100644
index 000000000000..c180a111021d
--- /dev/null
+++ b/dev-python/twisted/files/twisted-2.1.0-echo-less.patch
@@ -0,0 +1,13 @@
+=== modified file 'twisted/test/test_process.py'
+--- twisted/test/test_process.py	
++++ twisted/test/test_process.py	
+@@ -76,7 +76,7 @@
+ 
+ class EchoProtocol(protocol.ProcessProtocol):
+ 
+-    s = "1234567" * 1001
++    s = "1234567" * 11
+     n = 10
+     finished = 0
+ 
+
diff --git a/dev-python/twisted/twisted-2.0.1.ebuild b/dev-python/twisted/twisted-2.0.1.ebuild
index 948ce05f3f7c..d2fbe974c9fb 100644
--- a/dev-python/twisted/twisted-2.0.1.ebuild
+++ b/dev-python/twisted/twisted-2.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/twisted-2.0.1.ebuild,v 1.3 2005/12/05 17:10:34 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/twisted-2.0.1.ebuild,v 1.4 2006/04/03 21:16:14 marienz Exp $
 
 inherit eutils distutils versionator
 
@@ -25,6 +25,13 @@ S="${WORKDIR}/${MY_P}"
 
 DOCS="ChangeLog CREDITS INSTALL NEWS README"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# give a load-sensitive test a better chance of succeeding
+	epatch "${FILESDIR}/${P}-echo-less.patch"
+}
+
 src_install() {
 	distutils_src_install
 
diff --git a/dev-python/twisted/twisted-2.1.0.ebuild b/dev-python/twisted/twisted-2.1.0.ebuild
index bd0fc02f460f..d9ebceea6950 100644
--- a/dev-python/twisted/twisted-2.1.0.ebuild
+++ b/dev-python/twisted/twisted-2.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/twisted-2.1.0.ebuild,v 1.5 2006/01/31 21:14:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/twisted-2.1.0.ebuild,v 1.6 2006/04/03 21:16:14 marienz Exp $
 
 inherit eutils distutils versionator
 
@@ -28,6 +28,8 @@ DOCS="CREDITS INSTALL NEWS README"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	# give a load-sensitive test a better chance of succeeding
+	epatch "${FILESDIR}/${P}-echo-less.patch"
 	epatch "${FILESDIR}/${P}-trial-tests.patch"
 	epatch "${FILESDIR}/${P}-trial-tests2.patch"
 	epatch "${FILESDIR}/${P}-zsh-head.patch"
diff --git a/dev-python/twisted/twisted-2.2.0.ebuild b/dev-python/twisted/twisted-2.2.0.ebuild
index 3c24a64ffb99..7a320b547c74 100644
--- a/dev-python/twisted/twisted-2.2.0.ebuild
+++ b/dev-python/twisted/twisted-2.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/twisted-2.2.0.ebuild,v 1.2 2006/02/13 23:49:21 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/twisted-2.2.0.ebuild,v 1.3 2006/04/03 21:16:14 marienz Exp $
 
 inherit eutils distutils versionator
 
@@ -28,6 +28,11 @@ DOCS="CREDITS INSTALL NEWS README"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+
+	# Give a load-sensitive test a better chance of succeeding.
+	epatch "${FILESDIR}/${PN}-2.1.0-echo-less.patch"
+
+	# Pass valid arguments to "head" in the zsh completion function.
 	epatch "${FILESDIR}/${PN}-2.1.0-zsh-head.patch"
 }