Add patch to fix failing test with old pytest on EL7

epel9
Orion Poplawski 11 years ago
parent b7de25d36a
commit 8c117d15a8

@ -0,0 +1,29 @@
diff -up execnet-1.2.0/testing/test_rsync.py.needssymlink execnet-1.2.0/testing/test_rsync.py
--- execnet-1.2.0/testing/test_rsync.py.needssymlink 2014-06-16 09:26:02.320929971 -0600
+++ execnet-1.2.0/testing/test_rsync.py 2014-06-18 11:42:01.024851339 -0600
@@ -12,9 +12,6 @@ def pytest_funcarg__gw1(request):
)
pytest_funcarg__gw2 = pytest_funcarg__gw1
-needssymlink = pytest.mark.skipif(not hasattr(py.path.local, "mksymlinkto"),
- reason="py.path.local has no mksymlinkto() on this platform")
-
def pytest_funcarg__dirs(request):
t = request.getfuncargvalue('tmpdir')
class dirs:
@@ -133,7 +130,6 @@ class TestRSync:
mode = destdir.stat().mode
assert mode & 511 == 504
- @needssymlink
def test_symlink_rsync(self, dirs, gw1):
source = dirs.source
dest = dirs.dest1
@@ -149,7 +145,6 @@ class TestRSync:
assert dest.join('rellink').readlink() == "subdir/existant"
assert dest.join('abslink').readlink() == expected
- @needssymlink
def test_symlink2_rsync(self, dirs, gw1):
source = dirs.source
dest = dirs.dest1

@ -9,7 +9,7 @@
Name: python-%{srcname} Name: python-%{srcname}
Version: 1.2.0 Version: 1.2.0
Release: 3%{?dist} Release: 4%{?dist}
Summary: Elastic Python Deployment Summary: Elastic Python Deployment
Group: Development/Languages Group: Development/Languages
# package is now under the MIT license, (although the docs still say # package is now under the MIT license, (although the docs still say
@ -22,6 +22,8 @@ Source0: http://pypi.python.org/packages/source/e/%{srcname}/%{srcname}-%
Patch0: python-execnet-fix-test-channel-on-python-3.4.patch Patch0: python-execnet-fix-test-channel-on-python-3.4.patch
# https://bitbucket.org/hpk42/execnet/pull-request/11/remove-redudant-print-statement/diff # https://bitbucket.org/hpk42/execnet/pull-request/11/remove-redudant-print-statement/diff
Patch1: python-execnet-remove-redundant-print-statement.patch Patch1: python-execnet-remove-redundant-print-statement.patch
# pytest is too old in EL7 - this patch removes the failing @needssymlink decorator
Patch2: python-execnet-needssymlink.patch
BuildArch: noarch BuildArch: noarch
BuildRequires: python-devel BuildRequires: python-devel
BuildRequires: python-setuptools BuildRequires: python-setuptools
@ -77,6 +79,7 @@ minimal and fast API targetting the following uses:
%setup -q -n %{srcname}-%{version} %setup -q -n %{srcname}-%{version}
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1
# remove shebangs and fix permissions # remove shebangs and fix permissions
find . -type f -a \( -name '*.py' -o -name 'py.*' \) \ find . -type f -a \( -name '*.py' -o -name 'py.*' \) \
@ -138,6 +141,9 @@ popd
%changelog %changelog
* Wed Jun 18 2014 Orion Poplawski <orion@cora.nwra.com> - 1.2.0-4
- Add patch to fix failing test with old pytest on EL7
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.0-3 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

Loading…
Cancel
Save