python-pytest/python-pytest-timeout
SHA256
11
0
Fork 0
forked from pool/python-pytest-timeout
Code Pull Requests Activity

- Fix build with pytest4 from upstream:

Browse Source 
* pytest4.patch

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:pytest/python-pytest-timeout?expand=0&rev=8
This commit is contained in:
Tomáš Chvátal
2019-02-12 15:46:13 +00:00
committed by Git OBS Bridge
parent 3b0eb5d150
commit 42796e60f4
3 changed files with 41 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
pytest4.patch Normal file
View File

@@ -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("""