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

set unique fixtureinfo if it was changed from params marks

This commit is contained in:
Aleksandr Brodin 2023-09-05 17:53:37 +07:00 committed by Aleksandr Brodin
parent b1a51f98e2
commit aa9bc87110
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/_pytest/compat.py
View File

@ -163,6 +163,7 @@ def getfuncargnames(
and not isinstance( and not isinstance(
inspect.getattr_static(cls, name, default=None), staticmethod inspect.getattr_static(cls, name, default=None), staticmethod
) )
and not hasattr(function, "__self__")
): ):
arg_names = arg_names[1:] arg_names = arg_names[1:]
# Remove any names that will be replaced with mocks. # Remove any names that will be replaced with mocks.

22
src/_pytest/python.py
View File

@ -507,7 +507,7 @@ class PyCollector(PyobjMixin, nodes.Collector):
for callspec in metafunc._calls: for callspec in metafunc._calls:
subname = f"{name}[{callspec.id}]" subname = f"{name}[{callspec.id}]"
node = Function.from_parent( yield Function.from_parent(
self, self,
name=subname, name=subname,
callspec=callspec, callspec=callspec,
@ -515,18 +515,6 @@ class PyCollector(PyobjMixin, nodes.Collector):
keywords={callspec.id: True}, keywords={callspec.id: True},
originalname=name, originalname=name,
) )
# if usefixtures is added via a parameter, then there will be
# fixtures missing from the node.fixturenames
callspec_usefixtures = tuple(
arg
for mark in node.iter_markers(name="usefixtures")
for arg in mark.args
if arg not in node.fixturenames
)
if callspec_usefixtures:
# node.fixturenames must be unique for this parameter
node.fixturenames = [*node.fixturenames, *callspec_usefixtures]
yield node
def importtestmodule( def importtestmodule(
@ -1811,9 +1799,13 @@ class Function(PyobjMixin, nodes.Item):
if keywords: if keywords:
self.keywords.update(keywords) self.keywords.update(keywords)
fm = self.session._fixturemanager
fixtureinfo_ = fm.getfixtureinfo(self, self.obj, self.cls)
if fixtureinfo is None: if fixtureinfo is None:
fm = self.session._fixturemanager fixtureinfo = fixtureinfo_
fixtureinfo = fm.getfixtureinfo(self, self.obj, self.cls) elif set(fixtureinfo_.names_closure) != set(fixtureinfo.names_closure):
fixtureinfo_.name2fixturedefs.update(fixtureinfo.name2fixturedefs)
fixtureinfo = fixtureinfo_
self._fixtureinfo: FuncFixtureInfo = fixtureinfo self._fixtureinfo: FuncFixtureInfo = fixtureinfo
self.fixturenames = fixtureinfo.names_closure self.fixturenames = fixtureinfo.names_closure
self._initrequest() self._initrequest()