No longer silently ignore errors in parametrize callable ids
This commit is contained in:
parent
964ccb93bb
commit
a9193a1531
|
@ -8,6 +8,8 @@ New Features
|
||||||
* Added an ini option ``doctest_encoding`` to specify which encoding to use for doctest files.
|
* Added an ini option ``doctest_encoding`` to specify which encoding to use for doctest files.
|
||||||
Thanks `@wheerd`_ for the PR (`#2101`_).
|
Thanks `@wheerd`_ for the PR (`#2101`_).
|
||||||
|
|
||||||
|
* pytest now warns when a callable ids raises in a parametrized test. Thanks `@fogo`_ for the PR.
|
||||||
|
|
||||||
*
|
*
|
||||||
|
|
||||||
|
|
||||||
|
@ -39,6 +41,7 @@ Changes
|
||||||
.. _@fushi: https://github.com/fushi
|
.. _@fushi: https://github.com/fushi
|
||||||
.. _@mattduck: https://github.com/mattduck
|
.. _@mattduck: https://github.com/mattduck
|
||||||
.. _@wheerd: https://github.com/wheerd
|
.. _@wheerd: https://github.com/wheerd
|
||||||
|
.. _@fogo: https://github.com/fogo
|
||||||
|
|
||||||
.. _#1512: https://github.com/pytest-dev/pytest/issues/1512
|
.. _#1512: https://github.com/pytest-dev/pytest/issues/1512
|
||||||
.. _#1874: https://github.com/pytest-dev/pytest/pull/1874
|
.. _#1874: https://github.com/pytest-dev/pytest/pull/1874
|
||||||
|
|
|
@ -928,12 +928,17 @@ def _find_parametrized_scope(argnames, arg2fixturedefs, indirect):
|
||||||
|
|
||||||
def _idval(val, argname, idx, idfn, config=None):
|
def _idval(val, argname, idx, idfn, config=None):
|
||||||
if idfn:
|
if idfn:
|
||||||
|
s = None
|
||||||
try:
|
try:
|
||||||
s = idfn(val)
|
s = idfn(val)
|
||||||
if s:
|
|
||||||
return _escape_strings(s)
|
|
||||||
except Exception:
|
except Exception:
|
||||||
pass
|
# See issue https://github.com/pytest-dev/pytest/issues/2169
|
||||||
|
import warnings
|
||||||
|
msg = "Raised while trying to determine id of parameter %s at position %d." % (argname, idx)
|
||||||
|
msg += '\nUpdate your code as this will raise an error in pytest-4.0.'
|
||||||
|
warnings.warn(msg)
|
||||||
|
if s:
|
||||||
|
return _escape_strings(s)
|
||||||
|
|
||||||
if config:
|
if config:
|
||||||
hook_id = config.hook.pytest_make_parametrize_id(config=config, val=val)
|
hook_id = config.hook.pytest_make_parametrize_id(config=config, val=val)
|
||||||
|
|
|
@ -296,18 +296,58 @@ class TestMetafunc:
|
||||||
@pytest.mark.issue351
|
@pytest.mark.issue351
|
||||||
def test_idmaker_idfn_exception(self):
|
def test_idmaker_idfn_exception(self):
|
||||||
from _pytest.python import idmaker
|
from _pytest.python import idmaker
|
||||||
|
from _pytest.recwarn import WarningsRecorder
|
||||||
|
|
||||||
|
class BadIdsException(Exception):
|
||||||
|
pass
|
||||||
|
|
||||||
def ids(val):
|
def ids(val):
|
||||||
raise Exception("bad code")
|
raise BadIdsException("ids raised")
|
||||||
|
|
||||||
result = idmaker(("a", "b"), [(10.0, IndexError()),
|
rec = WarningsRecorder()
|
||||||
(20, KeyError()),
|
with rec:
|
||||||
("three", [1, 2, 3]),
|
idmaker(("a", "b"), [(10.0, IndexError()),
|
||||||
], idfn=ids)
|
(20, KeyError()),
|
||||||
assert result == ["10.0-b0",
|
("three", [1, 2, 3]),
|
||||||
"20-b1",
|
], idfn=ids)
|
||||||
"three-b2",
|
|
||||||
]
|
assert [str(i.message) for i in rec.list] == [
|
||||||
|
"Raised while trying to determine id of parameter a at position 0."
|
||||||
|
"\nUpdate your code as this will raise an error in pytest-4.0.",
|
||||||
|
"Raised while trying to determine id of parameter b at position 0."
|
||||||
|
"\nUpdate your code as this will raise an error in pytest-4.0.",
|
||||||
|
"Raised while trying to determine id of parameter a at position 1."
|
||||||
|
"\nUpdate your code as this will raise an error in pytest-4.0.",
|
||||||
|
"Raised while trying to determine id of parameter b at position 1."
|
||||||
|
"\nUpdate your code as this will raise an error in pytest-4.0.",
|
||||||
|
"Raised while trying to determine id of parameter a at position 2."
|
||||||
|
"\nUpdate your code as this will raise an error in pytest-4.0.",
|
||||||
|
"Raised while trying to determine id of parameter b at position 2."
|
||||||
|
"\nUpdate your code as this will raise an error in pytest-4.0.",
|
||||||
|
]
|
||||||
|
|
||||||
|
|
||||||
|
def test_parametrize_ids_exception(self, testdir):
|
||||||
|
"""
|
||||||
|
:param testdir: the instance of Testdir class, a temporary
|
||||||
|
test directory.
|
||||||
|
"""
|
||||||
|
testdir.makepyfile("""
|
||||||
|
import pytest
|
||||||
|
|
||||||
|
def ids(arg):
|
||||||
|
raise Exception("bad ids")
|
||||||
|
|
||||||
|
@pytest.mark.parametrize("arg", ["a", "b"], ids=ids)
|
||||||
|
def test_foo(arg):
|
||||||
|
pass
|
||||||
|
""")
|
||||||
|
result = testdir.runpytest("--collect-only")
|
||||||
|
result.stdout.fnmatch_lines([
|
||||||
|
"<Module 'test_parametrize_ids_exception.py'>",
|
||||||
|
" <Function 'test_foo[a]'>",
|
||||||
|
" <Function 'test_foo[b]'>",
|
||||||
|
])
|
||||||
|
|
||||||
def test_idmaker_with_ids(self):
|
def test_idmaker_with_ids(self):
|
||||||
from _pytest.python import idmaker
|
from _pytest.python import idmaker
|
||||||
|
|
Loading…
Reference in New Issue