Update to new upstream release (#1788278)
parent
45f95312fe
commit
a24f0e35cc
@ -1,28 +0,0 @@
|
||||
# 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("""
|
@ -1 +1 @@
|
||||
SHA512 (pytest-timeout-1.3.3.tar.gz) = 633f5aee550d568e403b958f4490ecb828eb322811c9f18cfefb26613be4fc36da14232ecbef8666fcf2dc693a93674c00a853ab546ea8328a07ea34da79fb84
|
||||
SHA512 (pytest-timeout-1.3.4.tar.gz) = 29af25f3c3776d9ef63c6b7217ffc6b0cedd873b8cc96be742a642da84d12c8988bb9b409e00850246e554b21908d6fd2207692650b154cf6831f38c4395bc80
|
||||
|
Loading…
Reference in new issue