1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
|
diff -ur pytest-timeout-1.3.3.orig/test_pytest_timeout.py pytest-timeout-1.3.3/test_pytest_timeout.py
--- pytest-timeout-1.3.3.orig/test_pytest_timeout.py 2018-11-16 03:41:33.000000000 -0800
+++ pytest-timeout-1.3.3/test_pytest_timeout.py 2019-11-21 22:34:08.429287370 -0800
@@ -1,4 +1,5 @@
import os
+import platform
import os.path
import signal
import time
@@ -93,6 +94,6 @@
# 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):
@@ -133,6 +134,6 @@
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):
|
