Merge branch 'main' into fix-13537

Author: gomri15

changelog/13773.bugfix.rst

@@ -0,0 +1 @@
+Fixed the static fixture closure calculation to properly consider transitive dependencies requested by overridden fixtures.

changelog/13779.breaking.rst

@@ -0,0 +1,22 @@
+**PytestRemovedIn9Warning deprecation warnings are now errors by default.**
+
+Following our plan to remove deprecated features with as little disruption as
+possible, all warnings of type ``PytestRemovedIn9Warning`` now generate errors
+instead of warning messages by default.
+
+**The affected features will be effectively removed in pytest 9.1**, so please consult the
+:ref:`deprecations` section in the docs for directions on how to update existing code.
+
+In the pytest ``9.0.X`` series, it is possible to change the errors back into warnings as a
+stopgap measure by adding this to your ``pytest.ini`` file:
+
+.. code-block:: ini
+
+    [pytest]
+    filterwarnings =
+        ignore::pytest.PytestRemovedIn9Warning
+
+But this will stop working when pytest ``9.1`` is released.
+
+**If you have concerns** about the removal of a specific feature, please add a
+comment to :issue:`13779`.

doc/en/getting-started.rst

@@ -73,7 +73,7 @@ The ``[100%]`` refers to the overall progress of running all test cases. After i
 Run multiple tests
 ----------------------------------------------------------
 
-``pytest`` will run all files of the form test_*.py or \*_test.py in the current directory and its subdirectories. More generally, it follows :ref:`standard test discovery rules <test discovery>`.
+``pytest`` will run all files of the form ``test_*.py`` or ``*_test.py`` in the current directory and its subdirectories. More generally, it follows :ref:`standard test discovery rules <test discovery>`.
 
 
 Assert that a certain exception is raised

src/_pytest/deprecated.py

@@ -27,8 +27,7 @@
 }
 
 
-# This can be* removed pytest 8, but it's harmless and common, so no rush to remove.
-# * If you're in the future: "could have been".
+# This could have been removed pytest 8, but it's harmless and common, so no rush to remove.
 YIELD_FIXTURE = PytestDeprecationWarning(
     "@pytest.yield_fixture is deprecated.\n"
     "Use @pytest.fixture instead; they are the same."

src/_pytest/fixtures.py

@@ -1645,9 +1645,18 @@ def getfixtureclosure(
                 fixturedefs = self.getfixturedefs(argname, parentnode)
                 if fixturedefs:
                     arg2fixturedefs[argname] = fixturedefs
-                    for arg in fixturedefs[-1].argnames:
-                        if arg not in fixturenames_closure:
-                            fixturenames_closure.append(arg)
+
+                    # Add dependencies from this fixture.
+                    # If it overrides a fixture with the same name and requests
+                    # it, also add dependencies from the overridden fixtures in
+                    # the chain. See also similar dealing in _get_active_fixturedef().
+                    for fixturedef in reversed(fixturedefs):  # pragma: no cover
+                        for arg in fixturedef.argnames:
+                            if arg not in fixturenames_closure:
+                                fixturenames_closure.append(arg)
+                        if argname not in fixturedef.argnames:
+                            # Overrides, but doesn't request super.
+                            break
 
         def sort_by_scope(arg_name: str) -> Scope:
             try:

src/_pytest/warning_types.py

@@ -56,6 +56,12 @@ class PytestRemovedIn9Warning(PytestDeprecationWarning):
     __module__ = "pytest"
 
 
+class PytestRemovedIn10Warning(PytestDeprecationWarning):
+    """Warning class for features that will be removed in pytest 10."""
+
+    __module__ = "pytest"
+
+
 @final
 class PytestExperimentalApiWarning(PytestWarning, FutureWarning):
     """Warning category used to denote experiments in pytest.

src/_pytest/warnings.py

@@ -41,8 +41,7 @@ def catch_warnings_for_item(
             warnings.filterwarnings("always", category=DeprecationWarning)
             warnings.filterwarnings("always", category=PendingDeprecationWarning)
 
-        # To be enabled in pytest 9.0.0.
-        # warnings.filterwarnings("error", category=pytest.PytestRemovedIn9Warning)
+        warnings.filterwarnings("error", category=pytest.PytestRemovedIn9Warning)
 
         apply_warning_filters(config_filters, cmdline_filters)
 

src/pytest/__init__.py

@@ -82,6 +82,7 @@
 from _pytest.warning_types import PytestExperimentalApiWarning
 from _pytest.warning_types import PytestFDWarning
 from _pytest.warning_types import PytestRemovedIn9Warning
+from _pytest.warning_types import PytestRemovedIn10Warning
 from _pytest.warning_types import PytestReturnNotNoneWarning
 from _pytest.warning_types import PytestUnhandledThreadExceptionWarning
 from _pytest.warning_types import PytestUnknownMarkWarning
@@ -133,6 +134,7 @@
     "PytestFDWarning",
     "PytestPluginManager",
     "PytestRemovedIn9Warning",
+    "PytestRemovedIn10Warning",
     "PytestReturnNotNoneWarning",
     "PytestUnhandledThreadExceptionWarning",
     "PytestUnknownMarkWarning",

testing/acceptance_test.py

@@ -1324,7 +1324,7 @@ def test_foo(async_fixture):
                     pass
         """
     )
-    result = pytester.runpytest()
+    result = pytester.runpytest("-Wdefault::pytest.PytestRemovedIn9Warning")
     result.stdout.fnmatch_lines(
         [
             "*== warnings summary ==*",
@@ -1354,7 +1354,7 @@ def test_foo(async_fixture):
                 ...
         """
     )
-    result = pytester.runpytest()
+    result = pytester.runpytest("-Wdefault::pytest.PytestRemovedIn9Warning")
     result.stdout.fnmatch_lines(
         [
             "*== warnings summary ==*",
@@ -1388,7 +1388,7 @@ def test_foo(async_fixture):
                     pass
         """
     )
-    result = pytester.runpytest()
+    result = pytester.runpytest("-Wdefault::pytest.PytestRemovedIn9Warning")
     result.stdout.fnmatch_lines(
         [
             "*== warnings summary ==*",

testing/python/fixtures.py

@@ -5069,3 +5069,132 @@ def test_method(self, /, fix):
     )
     result = pytester.runpytest()
     result.assert_outcomes(passed=1)
+
+
+def test_fixture_closure_with_overrides(pytester: Pytester) -> None:
+    """Test that an item's static fixture closure properly includes transitive
+    dependencies through overridden fixtures (#13773)."""
+    pytester.makeconftest(
+        """
+        import pytest
+
+        @pytest.fixture
+        def db(): pass
+
+        @pytest.fixture
+        def app(db): pass
+        """
+    )
+    pytester.makepyfile(
+        """
+        import pytest
+
+        # Overrides conftest-level `app` and requests it.
+        @pytest.fixture
+        def app(app): pass
+
+        class TestClass:
+            # Overrides module-level `app` and requests it.
+            @pytest.fixture
+            def app(self, app): pass
+
+            def test_something(self, request, app):
+                # Both dynamic and static fixture closures should include 'db'.
+                assert 'db' in request.fixturenames
+                assert 'db' in request.node.fixturenames
+                # No dynamic dependencies, should be equal.
+                assert set(request.fixturenames) == set(request.node.fixturenames)
+        """
+    )
+    result = pytester.runpytest("-v")
+    result.assert_outcomes(passed=1)
+
+
+@pytest.mark.xfail(reason="not currently handled correctly")
+def test_fixture_closure_with_overrides_and_intermediary(pytester: Pytester) -> None:
+    """Test that an item's static fixture closure properly includes transitive
+    dependencies through overridden fixtures (#13773).
+
+    A more complicated case than test_fixture_closure_with_overrides, adds an
+    intermediary so the override chain is not direct.
+    """
+    pytester.makeconftest(
+        """
+        import pytest
+
+        @pytest.fixture
+        def db(): pass
+
+        @pytest.fixture
+        def app(db): pass
+
+        @pytest.fixture
+        def intermediate(app): pass
+        """
+    )
+    pytester.makepyfile(
+        """
+        import pytest
+
+        # Overrides conftest-level `app` and requests it.
+        @pytest.fixture
+        def app(intermediate): pass
+
+        class TestClass:
+            # Overrides module-level `app` and requests it.
+            @pytest.fixture
+            def app(self, app): pass
+
+            def test_something(self, request, app):
+                # Both dynamic and static fixture closures should include 'db'.
+                assert 'db' in request.fixturenames
+                assert 'db' in request.node.fixturenames
+                # No dynamic dependencies, should be equal.
+                assert set(request.fixturenames) == set(request.node.fixturenames)
+        """
+    )
+    result = pytester.runpytest("-v")
+    result.assert_outcomes(passed=1)
+
+
+def test_fixture_closure_with_broken_override_chain(pytester: Pytester) -> None:
+    """Test that an item's static fixture closure properly includes transitive
+    dependencies through overridden fixtures (#13773).
+
+    A more complicated case than test_fixture_closure_with_overrides, one of the
+    fixtures in the chain doesn't call its super, so it shouldn't be included.
+    """
+    pytester.makeconftest(
+        """
+        import pytest
+
+        @pytest.fixture
+        def db(): pass
+
+        @pytest.fixture
+        def app(db): pass
+        """
+    )
+    pytester.makepyfile(
+        """
+        import pytest
+
+        # Overrides conftest-level `app` and *doesn't* request it.
+        @pytest.fixture
+        def app(): pass
+
+        class TestClass:
+            # Overrides module-level `app` and requests it.
+            @pytest.fixture
+            def app(self, app): pass
+
+            def test_something(self, request, app):
+                # Both dynamic and static fixture closures should include 'db'.
+                assert 'db' not in request.fixturenames
+                assert 'db' not in request.node.fixturenames
+                # No dynamic dependencies, should be equal.
+                assert set(request.fixturenames) == set(request.node.fixturenames)
+        """
+    )
+    result = pytester.runpytest("-v")
+    result.assert_outcomes(passed=1)