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

replace `FuncFixtureInfo` with `FuncFixtureInfo2`

This commit is contained in:
Janick Gerstenberger 2023-10-27 16:58:37 +02:00
parent e9bb86b6a9
commit 5cd7e332e0
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/_pytest/doctest.py
View File

@ -265,7 +265,7 @@ class DoctestItem(Item):
# Stuff needed for fixture support. # Stuff needed for fixture support.
self.obj = None self.obj = None
fm = self.session._fixturemanager fm = self.session._fixturemanager
fixtureinfo = fm.getfixtureinfo(node=self, func=None, cls=None) fixtureinfo = fm.getfixtureinfo2(node=self, func=None, cls=None)
self._fixtureinfo = fixtureinfo self._fixtureinfo = fixtureinfo
self.fixturenames = fixtureinfo.names_closure self.fixturenames = fixtureinfo.names_closure
self._initrequest() self._initrequest()

12
src/_pytest/python.py
View File

@ -60,7 +60,7 @@ from _pytest.deprecated import INSTANCE_COLLECTOR
from _pytest.deprecated import NOSE_SUPPORT_METHOD from _pytest.deprecated import NOSE_SUPPORT_METHOD
from _pytest.fixtures import FixtureDef from _pytest.fixtures import FixtureDef
from _pytest.fixtures import FixtureRequest from _pytest.fixtures import FixtureRequest
from _pytest.fixtures import FuncFixtureInfo from _pytest.fixtures import FuncFixtureInfo2
from _pytest.fixtures import get_scope_node from _pytest.fixtures import get_scope_node
from _pytest.main import Session from _pytest.main import Session
from _pytest.mark import MARK_GEN from _pytest.mark import MARK_GEN
@ -1199,7 +1199,7 @@ class Metafunc:
def __init__( def __init__(
self, self,
definition: "FunctionDefinition", definition: "FunctionDefinition",
fixtureinfo: fixtures.FuncFixtureInfo, fixtureinfo: fixtures.FuncFixtureInfo2,
config: Config, config: Config,
cls=None, cls=None,
module=None, module=None,
@ -1648,7 +1648,7 @@ def _show_fixtures_per_test(config: Config, session: Session) -> None:
def write_item(item: nodes.Item) -> None: def write_item(item: nodes.Item) -> None:
# Not all items have _fixtureinfo attribute. # Not all items have _fixtureinfo attribute.
info: Optional[FuncFixtureInfo] = getattr(item, "_fixtureinfo", None) info: Optional[FuncFixtureInfo2] = getattr(item, "_fixtureinfo", None)
if info is None or not info.name2fixturedefs: if info is None or not info.name2fixturedefs:
# This test item does not use any fixtures. # This test item does not use any fixtures.
return return
@ -1775,7 +1775,7 @@ class Function(PyobjMixin, nodes.Item):
callobj=NOTSET, callobj=NOTSET,
keywords: Optional[Mapping[str, Any]] = None, keywords: Optional[Mapping[str, Any]] = None,
session: Optional[Session] = None, session: Optional[Session] = None,
fixtureinfo: Optional[FuncFixtureInfo] = None, fixtureinfo: Optional[FuncFixtureInfo2] = None,
originalname: Optional[str] = None, originalname: Optional[str] = None,
) -> None: ) -> None:
super().__init__(name, parent, config=config, session=session) super().__init__(name, parent, config=config, session=session)
@ -1811,8 +1811,8 @@ class Function(PyobjMixin, nodes.Item):
if fixtureinfo is None: if fixtureinfo is None:
fm = self.session._fixturemanager fm = self.session._fixturemanager
fixtureinfo = fm.getfixtureinfo(self, self.obj, self.cls) fixtureinfo = fm.getfixtureinfo2(self, self.obj, self.cls)
self._fixtureinfo: FuncFixtureInfo = fixtureinfo self._fixtureinfo: FuncFixtureInfo2 = fixtureinfo
self.fixturenames = fixtureinfo.names_closure self.fixturenames = fixtureinfo.names_closure
self._initrequest() self._initrequest()