Skip to content

Commit 857098f

Browse files
committed
added indicative error when parametrizing an argument with a default value
1 parent 36f6687 commit 857098f

File tree

4 files changed

+33
-7
lines changed

4 files changed

+33
-7
lines changed

_pytest/compat.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,14 @@ def getfuncargnames(function, is_method=False, cls=None):
135135
return arg_names
136136

137137

138+
def get_default_arg_names(function):
139+
# Note: this code intentionally mirrors the code at the beginning of getfuncargnames,
140+
# to get the arguments which were excluded from its result because they had default values
141+
return tuple(p.name for p in signature(function).parameters.values()
142+
if p.kind in (Parameter.POSITIONAL_OR_KEYWORD, Parameter.KEYWORD_ONLY) and
143+
p.default is not Parameter.empty)
144+
145+
138146
if _PY3:
139147
STRING_TYPES = bytes, str
140148
UNICODE_TYPES = str,

_pytest/python.py

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
isclass, isfunction, is_generator, ascii_escaped,
2626
REGEX_TYPE, STRING_TYPES, NoneType, NOTSET,
2727
get_real_func, getfslineno, safe_getattr,
28-
safe_str, getlocation, enum,
28+
safe_str, getlocation, enum, get_default_arg_names
2929
)
3030
from _pytest.outcomes import fail
3131
from _pytest.mark.structures import transfer_markers
@@ -789,6 +789,7 @@ def parametrize(self, argnames, argvalues, indirect=False, ids=None,
789789
argnames, parameters = ParameterSet._for_parametrize(
790790
argnames, argvalues, self.function, self.config)
791791
del argvalues
792+
default_arg_names = set(get_default_arg_names(self.function))
792793

793794
if scope is None:
794795
scope = _find_parametrized_scope(argnames, self._arg2fixturedefs, indirect)
@@ -797,13 +798,16 @@ def parametrize(self, argnames, argvalues, indirect=False, ids=None,
797798
valtypes = {}
798799
for arg in argnames:
799800
if arg not in self.fixturenames:
800-
if isinstance(indirect, (tuple, list)):
801-
name = 'fixture' if arg in indirect else 'argument'
801+
if arg in default_arg_names:
802+
raise ValueError("%r already takes an argument %r with a default value" % (self.function, arg))
802803
else:
803-
name = 'fixture' if indirect else 'argument'
804-
raise ValueError(
805-
"%r uses no %s %r" % (
806-
self.function, name, arg))
804+
if isinstance(indirect, (tuple, list)):
805+
name = 'fixture' if arg in indirect else 'argument'
806+
else:
807+
name = 'fixture' if indirect else 'argument'
808+
raise ValueError(
809+
"%r uses no %s %r" % (
810+
self.function, name, arg))
807811

808812
if indirect is True:
809813
valtypes = dict.fromkeys(argnames, "params")

changelog/3221.feature

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Added a more indicative error message when parametrizing a function whose argument takes a default value.

testing/python/metafunc.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -616,6 +616,19 @@ def test_simple(x):
616616
"*uses no argument 'y'*",
617617
])
618618

619+
def test_parametrize_gives_indicative_error_on_function_with_default_argument(self, testdir):
620+
testdir.makepyfile("""
621+
import pytest
622+
623+
@pytest.mark.parametrize('x, y', [('a', 'b')])
624+
def test_simple(x, y=1):
625+
assert len(x) == 1
626+
""")
627+
result = testdir.runpytest("--collect-only")
628+
result.stdout.fnmatch_lines([
629+
"*already takes an argument 'y' with a default value",
630+
])
631+
619632
def test_addcalls_and_parametrize_indirect(self):
620633
def func(x, y):
621634
pass

0 commit comments

Comments
 (0)