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

fixtures: avoid some redundant work in `_fillfixtures`

This commit is contained in:
Ran Benita 2023-09-01 15:01:05 +03:00
parent 65c01f531b
commit d2b5177dd6
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/_pytest/fixtures.py
View File

@ -685,7 +685,10 @@ class TopRequest(FixtureRequest):
def _fillfixtures(self) -> None: def _fillfixtures(self) -> None:
item = self._pyfuncitem item = self._pyfuncitem
fixturenames = getattr(item, "fixturenames", self.fixturenames) fixturenames = getattr(item, "fixturenames", None)
if fixturenames is None:
# Mildly expensive so don't move into the getattr!
fixturenames = self.fixturenames
for argname in fixturenames: for argname in fixturenames:
if argname not in item.funcargs: if argname not in item.funcargs:
item.funcargs[argname] = self.getfixturevalue(argname) item.funcargs[argname] = self.getfixturevalue(argname)