floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert a tiny change

This commit is contained in:
Sadra Barikbin 2023-12-29 19:36:48 +03:30
parent d5bf27c79a
commit 18b7147969
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/_pytest/python.py
View File

@ -1158,7 +1158,7 @@ class CallSpec2:
arg2scope = dict(self._arg2scope) arg2scope = dict(self._arg2scope)
for arg, val, param_index in zip(argnames, valset, param_indices): for arg, val, param_index in zip(argnames, valset, param_indices):
if arg in params: if arg in params:
raise ValueError(f"duplicate {arg!r}") raise ValueError(f"duplicate parametrization of {arg!r}")
params[arg] = val params[arg] = val
indices[arg] = param_index indices[arg] = param_index
arg2scope[arg] = scope arg2scope[arg] = scope
@ -1396,8 +1396,8 @@ class Metafunc:
object.__setattr__(_param_mark._param_ids_from, "_param_ids_generated", ids) object.__setattr__(_param_mark._param_ids_from, "_param_ids_generated", ids)
# Add funcargs as fixturedefs to fixtureinfo.arg2fixturedefs by registering # Add funcargs as fixturedefs to fixtureinfo.arg2fixturedefs by registering
# artificial FixtureDef's so that later at test execution time we can rely # artificial FixtureDef's so that later at test execution time we can
# on a proper FixtureDef to exist for fixture setup. # rely on a proper FixtureDef to exist for fixture setup.
arg2fixturedefs = self._arg2fixturedefs arg2fixturedefs = self._arg2fixturedefs
node = None node = None
# If we have a scope that is higher than function, we need # If we have a scope that is higher than function, we need