|
 |
9b9daef |
# HG changeset patch
|
|
|
9b9daef |
# User Bruno Oliveira <nicoddemus@gmail.com>
|
|
|
9b9daef |
# Date 1542370558 7200
|
|
|
9b9daef |
# Node ID 36998c891573d8ec1db1acd4f9438cb3cf2aee2e
|
|
|
9b9daef |
# Parent 753c5f39d2a8d1477ea8653ca7c7bdbdca1efafc
|
|
|
9b9daef |
Change tests to use pytest.param
|
|
|
9b9daef |
|
|
|
9b9daef |
diff --git a/test_pytest_timeout.py b/test_pytest_timeout.py
|
|
|
9b9daef |
--- a/test_pytest_timeout.py
|
|
|
9b9daef |
+++ b/test_pytest_timeout.py
|
|
|
9b9daef |
@@ -93,7 +93,7 @@
|
|
|
9b9daef |
# assert 'Timeout' in result.stdout.str() + result.stderr.str()
|
|
|
9b9daef |
|
|
|
9b9daef |
|
|
|
9b9daef |
-@pytest.mark.parametrize('meth', [have_sigalrm('signal'), 'thread'])
|
|
|
9b9daef |
+@pytest.mark.parametrize('meth', [pytest.param('signal', marks=have_sigalrm), 'thread'])
|
|
|
9b9daef |
@pytest.mark.parametrize('scope', ['function', 'class', 'module', 'session'])
|
|
|
9b9daef |
def test_fix_setup(meth, scope, testdir):
|
|
|
9b9daef |
testdir.makepyfile("""
|
|
|
9b9daef |
@@ -133,7 +133,7 @@
|
|
|
9b9daef |
assert 'Timeout' not in result.stdout.str() + result.stderr.str()
|
|
|
9b9daef |
|
|
|
9b9daef |
|
|
|
9b9daef |
-@pytest.mark.parametrize('meth', [have_sigalrm('signal'), 'thread'])
|
|
|
9b9daef |
+@pytest.mark.parametrize('meth', [pytest.param('signal', marks=have_sigalrm), 'thread'])
|
|
|
9b9daef |
@pytest.mark.parametrize('scope', ['function', 'class', 'module', 'session'])
|
|
|
9b9daef |
def test_fix_finalizer(meth, scope, testdir):
|
|
|
9b9daef |
testdir.makepyfile("""
|