From 42796e60f48cda443441bc8699286e7307b97793d4b8aa9d0c8b5137606e47d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Tue, 12 Feb 2019 15:46:13 +0000
Subject: [PATCH] - Fix build with pytest4 from upstream:   * pytest4.patch

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:pytest/python-pytest-timeout?expand=0&rev=8
---
 pytest4.patch                 | 28 ++++++++++++++++++++++++++++
 python-pytest-timeout.changes |  6 ++++++
 python-pytest-timeout.spec    | 23 +++++++----------------
 3 files changed, 41 insertions(+), 16 deletions(-)
 create mode 100644 pytest4.patch

diff --git a/pytest4.patch b/pytest4.patch
new file mode 100644
index 0000000..143643c
--- /dev/null
+++ b/pytest4.patch
@@ -0,0 +1,28 @@
+# HG changeset patch
+# User Bruno Oliveira <nicoddemus@gmail.com>
+# Date 1542370558 7200
+# Node ID 36998c891573d8ec1db1acd4f9438cb3cf2aee2e
+# Parent  753c5f39d2a8d1477ea8653ca7c7bdbdca1efafc
+Change tests to use pytest.param
+
+diff --git a/test_pytest_timeout.py b/test_pytest_timeout.py
+--- a/test_pytest_timeout.py
++++ b/test_pytest_timeout.py
+@@ -93,7 +93,7 @@
+ #     assert 'Timeout' in result.stdout.str() + result.stderr.str()
+ 
+ 
+-@pytest.mark.parametrize('meth', [have_sigalrm('signal'), 'thread'])
++@pytest.mark.parametrize('meth', [pytest.param('signal', marks=have_sigalrm), 'thread'])
+ @pytest.mark.parametrize('scope', ['function', 'class', 'module', 'session'])
+ def test_fix_setup(meth, scope, testdir):
+     testdir.makepyfile("""
+@@ -133,7 +133,7 @@
+     assert 'Timeout' not in result.stdout.str() + result.stderr.str()
+ 
+ 
+-@pytest.mark.parametrize('meth', [have_sigalrm('signal'), 'thread'])
++@pytest.mark.parametrize('meth', [pytest.param('signal', marks=have_sigalrm), 'thread'])
+ @pytest.mark.parametrize('scope', ['function', 'class', 'module', 'session'])
+ def test_fix_finalizer(meth, scope, testdir):
+     testdir.makepyfile("""
diff --git a/python-pytest-timeout.changes b/python-pytest-timeout.changes
index 8acce87..8f2fa9a 100644
--- a/python-pytest-timeout.changes
+++ b/python-pytest-timeout.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Feb 12 15:43:02 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Fix build with pytest4 from upstream:
+  * pytest4.patch
+
 -------------------------------------------------------------------
 Wed Nov 21 14:20:15 UTC 2018 - Enno Gotthold <egotthold@suse.com>
 
diff --git a/python-pytest-timeout.spec b/python-pytest-timeout.spec
index c63d8b5..bbfed3a 100644
--- a/python-pytest-timeout.spec
+++ b/python-pytest-timeout.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-pytest-timeout
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,6 @@
 
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
-%bcond_without test
 Name:           python-pytest-timeout
 Version:        1.3.3
 Release:        0
@@ -26,17 +25,16 @@ License:        MIT
 Group:          Development/Languages/Python
 URL:            http://bitbucket.org/pytest-dev/pytest-timeout/
 Source:         https://files.pythonhosted.org/packages/source/p/pytest-timeout/pytest-timeout-%{version}.tar.gz
+Patch0:         pytest4.patch
 BuildRequires:  %{python_module devel}
+BuildRequires:  %{python_module pexpect}
+BuildRequires:  %{python_module pytest >= 3.6.0}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 Requires:       python-pexpect
 Requires:       python-pytest >= 3.6.0
 BuildArch:      noarch
-%if %{with test}
-BuildRequires:  %{python_module pexpect}
-BuildRequires:  %{python_module pytest >= 3.6.0}
-%endif
 %python_subpackages
 
 %description
@@ -58,6 +56,7 @@ side-effects.
 
 %prep
 %setup -q -n pytest-timeout-%{version}
+%patch0 -p1
 
 %build
 %python_build
@@ -66,17 +65,9 @@ side-effects.
 %python_install
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 
-%if %{with test}
 %check
-mkdir tester
-pushd tester
-ln -s ../test_pytest_timeout.py .
-%{python_expand export PYTHONPATH=%{buildroot}%{$python_sitelib}
-$python -B -m pytest test_pytest_timeout.py
-rm %{buildroot}%{$python_sitelib}/__pycache__/pytest_timeout*-PYTEST.py*
-}
-popd
-%endif
+export PYTHONDONTWRITEBYTECODE=1
+%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} $python -m pytest test_pytest_timeout.py
 
 %files %{python_files}
 %license LICENSE