[python-execnet] Add upstream patch for failing test.
Thomas Moschny
thm at fedoraproject.org
Tue Jan 17 16:10:39 UTC 2012
commit 708a39949cd5e73c3f63dcdde9f1a594da77205b
Author: Thomas Moschny <thm at fedoraproject.org>
Date: Tue Jan 17 16:37:21 2012 +0100
Add upstream patch for failing test.
execnet-debugfilename.patch | 17 +++++++++++++++++
python-execnet.spec | 9 ++++++++-
2 files changed, 25 insertions(+), 1 deletions(-)
---
diff --git a/execnet-debugfilename.patch b/execnet-debugfilename.patch
new file mode 100644
index 0000000..ac84a76
--- /dev/null
+++ b/execnet-debugfilename.patch
@@ -0,0 +1,17 @@
+diff -r 8900be7ee856 -r 1a63deea3424 testing/test_gateway.py
+--- a/testing/test_gateway.py Mon Oct 24 18:03:24 2011 +0200
++++ b/testing/test_gateway.py Sat Nov 19 07:24:11 2011 +0000
+@@ -350,8 +350,11 @@
+ monkeypatch.setenv("TEMP", tmpdir) # windows
+ monkeypatch.setenv('EXECNET_DEBUG', "1")
+ gw = execnet.makegateway("popen")
+- pid = gw.remote_exec("import os ; channel.send(os.getpid())").receive()
+- slavefile = tmpdir.join("execnet-debug-%s" % pid)
++ # hack out the debuffilename
++ fn = gw.remote_exec(
++ "import execnet;channel.send(execnet.gateway_base.fn)"
++ ).receive()
++ slavefile = py.path.local(fn)
+ assert slavefile.check()
+ slave_line = "creating slavegateway"
+ for line in slavefile.readlines():
diff --git a/python-execnet.spec b/python-execnet.spec
index 797ad2a..7a2fa1f 100644
--- a/python-execnet.spec
+++ b/python-execnet.spec
@@ -10,12 +10,14 @@
Name: python-%{srcname}
Version: 1.0.9
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Elastic Python Deployment
Group: Development/Languages
License: GPLv2+ and MIT
URL: http://codespeak.net/execnet
Source0: http://pypi.python.org/packages/source/e/%{srcname}/%{srcname}-%{version}.zip
+# upstream changeset 1a63deea3424
+Patch0: execnet-debugfilename.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: python-devel
@@ -23,6 +25,7 @@ BuildRequires: python-setuptools
Requires: python-setuptools
BuildRequires: pytest
BuildRequires: python-sphinx
+BuildRequires: /bin/ps
%if 0%{?with_python3}
BuildRequires: python3-devel
BuildRequires: python3-setuptools
@@ -68,6 +71,7 @@ enables interoperation between CPython 2.4-3.1, Jython 2.5 and PyPy
%prep
%setup -q -n %{srcname}-%{version}
+%patch0 -p1
# remove shebangs and fix permissions
find . -type f -a \( -name '*.py' -o -name 'py.*' \) \
@@ -135,6 +139,9 @@ rm -rf %{buildroot}
%changelog
+* Tue Jan 17 2012 Thomas Moschny <thomas.moschny at gmx.de> - 1.0.9-3
+- Add upstream patch for failing test.
+
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.9-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list