p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

doctest: inline `_setup_fixtures`, make more similar to `Function` 

There used to be two callers to `_setup_fixtures()`, now there's only
one, so inline it and make `DoctestItem` more similar to `Function`.

(Eventually we may want to generalize `TopRequest` from taking
`Function` directly to some "fixture-supporting item", removing the
remaining `type: ignore` here and allowing plugins to do it in a stable
manner).
This commit is contained in:
Ran Benita 2023-09-08 10:52:08 +03:00
parent b3a981d385
commit ab63ebb3dc
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/_pytest/doctest.py
View File

@ -261,8 +261,14 @@ class DoctestItem(Item):
super().__init__(name, parent) super().__init__(name, parent)
self.runner = runner self.runner = runner
self.dtest = dtest self.dtest = dtest
# Stuff needed for fixture support.
self.obj = None self.obj = None
self.fixture_request: Optional[TopRequest] = None fm = self.session._fixturemanager
fixtureinfo = fm.getfixtureinfo(node=self, func=None, cls=None)
self._fixtureinfo = fixtureinfo
self.fixturenames = fixtureinfo.names_closure
self._initrequest()
@classmethod @classmethod
def from_parent( # type: ignore def from_parent( # type: ignore
@ -277,11 +283,16 @@ class DoctestItem(Item):
"""The public named constructor.""" """The public named constructor."""
return super().from_parent(name=name, parent=parent, runner=runner, dtest=dtest) return super().from_parent(name=name, parent=parent, runner=runner, dtest=dtest)
def _initrequest(self) -> None:
self.funcargs: Dict[str, object] = {}
self._request = TopRequest(self, _ispytest=True) # type: ignore[arg-type]
def setup(self) -> None: def setup(self) -> None:
if self.dtest is not None: if self.dtest is not None:
self.fixture_request = _setup_fixtures(self) self._request._fillfixtures()
globs = dict(getfixture=self.fixture_request.getfixturevalue)
for name, value in self.fixture_request.getfixturevalue( globs = dict(getfixture=self._request.getfixturevalue)
for name, value in self._request.getfixturevalue(
"doctest_namespace" "doctest_namespace"
).items(): ).items():
globs[name] = value globs[name] = value
@ -589,19 +600,6 @@ class DoctestModule(Module):
) )
def _setup_fixtures(doctest_item: DoctestItem) -> TopRequest:
"""Used by DoctestTextfile and DoctestItem to setup fixture information."""
doctest_item.funcargs = {} # type: ignore[attr-defined]
fm = doctest_item.session._fixturemanager
fixtureinfo = fm.getfixtureinfo(node=doctest_item, func=None, cls=None)
doctest_item._fixtureinfo = fixtureinfo # type: ignore[attr-defined]
doctest_item.fixturenames = fixtureinfo.names_closure # type: ignore[attr-defined]
fixture_request = TopRequest(doctest_item, _ispytest=True) # type: ignore[arg-type]
fixture_request._fillfixtures()
return fixture_request
def _init_checker_class() -> Type["doctest.OutputChecker"]: def _init_checker_class() -> Type["doctest.OutputChecker"]:
import doctest import doctest
import re import re