Do the improvement

Author: sadra-barikbin

src/_pytest/doctest.py

@@ -261,7 +261,16 @@ def __init__(
         self.runner = runner
         self.dtest = dtest
         self.obj = None
-        self.fixture_request: Optional[FixtureRequest] = None
+
+        def func() -> None:
+            pass
+
+        self.funcargs: Dict[str, object] = {}  # type: ignore[attr-defined]
+        fm = self.session._fixturemanager
+        self._fixtureinfo = fm.getfixtureinfo(  # type: ignore[attr-defined]
+            node=self, func=func, cls=None, funcargs=False
+        )
+        self._request = FixtureRequest(self, _ispytest=True)
 
     @classmethod
     def from_parent(  # type: ignore
@@ -278,9 +287,9 @@ def from_parent(  # type: ignore
 
     def setup(self) -> None:
         if self.dtest is not None:
-            self.fixture_request = _setup_fixtures(self)
-            globs = dict(getfixture=self.fixture_request.getfixturevalue)
-            for name, value in self.fixture_request.getfixturevalue(
+            self._request._fillfixtures()
+            globs = dict(getfixture=self._request.getfixturevalue)
+            for name, value in self._request.getfixturevalue(
                 "doctest_namespace"
             ).items():
                 globs[name] = value
@@ -571,22 +580,6 @@ def _find(
                 )
 
 
-def _setup_fixtures(doctest_item: DoctestItem) -> FixtureRequest:
-    """Used by DoctestTextfile and DoctestItem to setup fixture information."""
-
-    def func() -> None:
-        pass
-
-    doctest_item.funcargs = {}  # type: ignore[attr-defined]
-    fm = doctest_item.session._fixturemanager
-    doctest_item._fixtureinfo = fm.getfixtureinfo(  # type: ignore[attr-defined]
-        node=doctest_item, func=func, cls=None, funcargs=False
-    )
-    fixture_request = FixtureRequest(doctest_item, _ispytest=True)
-    fixture_request._fillfixtures()
-    return fixture_request
-
-
 def _init_checker_class() -> Type["doctest.OutputChecker"]:
     import doctest
     import re

src/_pytest/fixtures.py

@@ -891,7 +891,7 @@ def fail_fixturefunc(fixturefunc, msg: str) -> NoReturn:
 
 
 def call_fixture_func(
-    fixturefunc: "_FixtureFunc[FixtureValue]", request: FixtureRequest, kwargs
+    fixturefunc: "_FixtureFunc[FixtureValue]", request: SubRequest, kwargs
 ) -> FixtureValue:
     if is_generator(fixturefunc):
         fixturefunc = cast(
@@ -1679,3 +1679,17 @@ def _matchfactories(
         for fixturedef in fixturedefs:
             if fixturedef.baseid in parentnodeids:
                 yield fixturedef
+
+
+def pytest_runtest_teardown(item: nodes.Item, nextitem: nodes.Item) -> None:
+    if (
+        type(item).__name__ != "TestCaseFunction"
+        and hasattr(item, "_request")  # For YamlItem in testing/
+        and nextitem
+    ):
+        for fixture_name, fixture_def in item._request._fixture_defs.items():
+            if (
+                fixture_def._scope in HIGH_SCOPES
+                and fixture_name not in nextitem._request.fixturenames  # type: ignore[attr-defined]
+            ):
+                item.addfinalizer(functools.partial(fixture_def.finish, item._request))

testing/python/fixtures.py

@@ -12,6 +12,7 @@
 from _pytest.pytester import get_public_names
 from _pytest.pytester import Pytester
 from _pytest.python import Function
+from _pytest.scope import HIGH_SCOPES
 
 
 def test_getfuncargnames_functions():
@@ -4472,3 +4473,79 @@ def test_fixt(custom):
     result.assert_outcomes(errors=1)
     result.stdout.fnmatch_lines([expected])
     assert result.ret == ExitCode.TESTS_FAILED
+
+
+def test_teardown_high_scope_fixture_at_last_dependent_item(pytester: Pytester) -> None:
+    pytester.makepyfile(
+        **{
+            "tests/conftest.py": "import pytest\n"
+            + "\n".join(
+                [
+                    f"""
+@pytest.fixture(scope='{scope.value}', params=[None])
+def {scope.value}_scope_fixture(request):
+    yield None
+    print("Tearing down {scope.value}_scope_fixture")
+            """
+                    for scope in HIGH_SCOPES
+                ]
+            ),
+            "tests/test_module_a.py": """
+            class TestClass:
+                def test_class1(self, class_scope_fixture):
+                    pass
+
+                def test_class2(self):
+                    print("class_scope_fixture should have been torn down")
+
+                def teardown_class(self):
+                    print("Tearing down TestClass")
+
+            def test_module1(module_scope_fixture):
+                pass
+
+
+            def test_module2():
+                print("module_scope_fixture should have been torn down")
+
+            def teardown_module():
+                print("Tearing down test_module_a")
+
+            def test_package1(package_scope_fixture):
+                pass
+        """,
+            "tests/test_module_b.py": """
+            import pytest
+
+            def test_package2():
+                print("package_scope_fixture should have been torn down")
+
+            def test_session1(session_scope_fixture):
+                pass
+
+            def test_session2():
+                print("session_scope_fixture should have been torn down")
+        """,
+            "tests/__init__.py": """
+            def teardown_module():
+                print("Tearing down package tests")
+            """,
+        }
+    )
+    result = pytester.runpytest("-s")
+    assert result.ret == 0
+    result.stdout.fnmatch_lines(
+        [
+            "*Tearing down class_scope_fixture*",
+            "*class_scope_fixture should have been torn down*",
+            "*Tearing down TestClass*",
+            "*Tearing down module_scope_fixture*",
+            "*module_scope_fixture should have been torn down*",
+            "*Tearing down test_module_a*",
+            "*Tearing down package_scope_fixture*",
+            "*package_scope_fixture should have been torn down*",
+            "*Tearing down session_scope_fixture*",
+            "*session_scope_fixture should have been torn down*",
+            "*Tearing down package tests*",
+        ]
+    )