Fixed test with niceness!=0, bug #301417

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

diff --git a/ChangeLog b/ChangeLog
index 8cf6b8528213fc2d7295156ca2beb8eee8c242fd..538bed1deca751b0e7a6becbe09a5db96ac492d0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header$
 
+  23 Feb 2010; Andrey Grozin <grozin@gentoo.org> execnet-1.0.5.ebuild,
+  +files/execnet-1.0.5-test-nice.patch:
+  Fixed test with niceness!=0, bug #301417
+
 *execnet-1.0.5 (08 Feb 2010)
 
   08 Feb 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>

diff --git a/Manifest b/Manifest
index 004cf7fc1d0c3db926210f32cdafe9b84e601ebe..1d858d0c69b7e5cbf760b2a241a8bf572ad2e3ac 100644 (file)
--- a/Manifest
+++ b/Manifest
@@ -1,4 +1,5 @@
+AUX execnet-1.0.5-test-nice.patch 632 RMD160 ea47fa452f1c559f9acfb971ed737e3ce5f6c10e SHA1 8daaf8a6c624d5aa2331b37ce1ae727c137cca00 SHA256 77f5269993d77bcf57ade4a316734de214de64b38e2aa40360905c056765f50d
 DIST execnet-1.0.5.tar.gz 181584 RMD160 6817aaf0407879ffc26de86acad9488b26547270 SHA1 dae1a6ab1543c63b5a33b7cf213bfc0e97a453ef SHA256 10086e21bfec19e6aeb15972209c812e4d4ece6b3c1b8b7515c21eeefefc8dc9
-EBUILD execnet-1.0.5.ebuild 996 RMD160 2fd29a5efc6320cca22fedf34145e13ac8187400 SHA1 f10e697a35347a14cd3cd92c29d8a9180f073cb8 SHA256 d5f9fd6f97175ec55eba5310f195e034dc2a46e0d3bd3ade441996970d13d977
-MISC ChangeLog 783 RMD160 13ab4976a34b18f9453f70f7e125950786d36aa7 SHA1 3dbecab46758e5f04cf98192cd42734332470d3a SHA256 97d61687d5f1e8b31d37cc3bfc71a397f015afcc2d775c8f67574b744351d73d
+EBUILD execnet-1.0.5.ebuild 1125 RMD160 eaed579ee5c8195ad82346ae59d173e83288c49a SHA1 2f992e1fd9e00663c2525b5f6cc4c2ed6e7d288b SHA256 6f86358fe3828d24335e79c5101dba47e4c49035d1912bbe255e08908d049536
+MISC ChangeLog 936 RMD160 4d873ea78c84a70924e595398eef20011cc1117d SHA1 a0226fadb4ca32e47265508124b68d19bd6b6dc3 SHA256 658ebe8bc6258b6b37e8f1e4e9258e8a52035b804e1c0e1f90c724c698edaf7b
 MISC metadata.xml 375 RMD160 fa55887fbec717c8f8d946ec2d32ff420c906d83 SHA1 b34a98e7a27a1b1cfb04647fd5eb0c65fee4c787 SHA256 4fa41cf1cfe3171a09abf4fd8b8d69ad0039893b0a134fac53b4084e4de87009

diff --git a/execnet-1.0.5.ebuild b/execnet-1.0.5.ebuild
index 4296084ae6fae4a83d4838c4eb57e28155a3097d..d894ae2864b74f93e7d0000de79b8d9ed340a5bf 100644 (file)
--- a/execnet-1.0.5.ebuild
+++ b/execnet-1.0.5.ebuild
@@ -5,7 +5,7 @@
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"
 
-inherit distutils
+inherit distutils eutils
 
 DESCRIPTION="Rapid multi-Python deployment"
 HOMEPAGE="http://codespeak.net/execnet/ http://pypi.python.org/pypi/execnet"
@@ -21,6 +21,13 @@ DEPEND="dev-python/setuptools
        test? ( >=dev-python/py-1.1.1 )"
 RDEPEND=""
 
+src_prepare() {
+       distutils_src_prepare
+
+       # fixing test with nice, bug #301417
+       epatch "${FILESDIR}"/${P}-test-nice.patch
+}
+
 src_compile() {
        distutils_src_compile
        if use doc; then

diff --git a/files/execnet-1.0.5-test-nice.patch b/files/execnet-1.0.5-test-nice.patch
new file mode 100644 (file)
index 0000000..84143f3
--- /dev/null
+++ b/files/execnet-1.0.5-test-nice.patch
@@ -0,0 +1,15 @@
+ôÏÌØËÏ × execnet-1.0.5//testing: __init__.pyc
+diff -r -U1 execnet-1.0.5.orig//testing/test_xspec.py execnet-1.0.5//testing/test_xspec.py
+--- execnet-1.0.5.orig//testing/test_xspec.py  2009-12-11 15:05:52.000000000 +0100
++++ execnet-1.0.5//testing/test_xspec.py       2010-02-23 13:17:51.000000000 +0100
+@@ -72,2 +72,4 @@
+     def test_popen_nice(self):
++        import os
++        localnice=os.nice(0)
+         gw = execnet.makegateway("popen//nice=5")
+@@ -81,3 +83,3 @@
+         if remotenice is not None:
+-            assert remotenice == 5
++            assert remotenice == localnice+5
+ 
+ôÏÌØËÏ × execnet-1.0.5//testing: test_xspec.pyc