Merge branch 'main' into fix/duplicate-pythonwarnings

Author: tanuj-rai

AUTHORS

@@ -320,6 +320,7 @@ Mike Hoyle (hoylemd)
 Mike Lundy
 Milan Lesnek
 Miro Hrončok
+Mulat Mekonen
 mrbean-bremen
 Nathan Goldbaum
 Nathan Rousseau

changelog/13771.contrib.rst

@@ -0,0 +1 @@
+Skip `test_do_not_collect_symlink_siblings` on Windows environments without symlink support to avoid false negatives.

testing/python/fixtures.py

@@ -5071,6 +5071,42 @@ def test_method(self, /, fix):
     result.assert_outcomes(passed=1)
 
 
+def test_parametrization_dependency_pruning(pytester: Pytester) -> None:
+    """Test that when a fixture is dynamically shadowed by parameterization, it
+    is properly pruned and not executed."""
+    pytester.makepyfile(
+        """
+        import pytest
+
+
+        # This fixture should never run because shadowed_fixture is parametrized.
+        @pytest.fixture
+        def boom():
+            raise RuntimeError("BOOM!")
+
+
+        # This fixture is shadowed by metafunc.parametrize in pytest_generate_tests.
+        @pytest.fixture
+        def shadowed_fixture(boom):
+            return "fixture_value"
+
+
+        # Dynamically parametrize shadowed_fixture, replacing the fixture with direct values.
+        def pytest_generate_tests(metafunc):
+            if "shadowed_fixture" in metafunc.fixturenames:
+                metafunc.parametrize("shadowed_fixture", ["param1", "param2"])
+
+
+        # This test should receive shadowed_fixture as a parametrized value, and
+        # boom should not explode.
+        def test_shadowed(shadowed_fixture):
+            assert shadowed_fixture in ["param1", "param2"]
+        """
+    )
+    result = pytester.runpytest()
+    result.assert_outcomes(passed=2)
+
+
 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)."""

testing/test_collection.py

@@ -1871,7 +1871,8 @@ def test_do_not_collect_symlink_siblings(
     """
     # Use tmp_path because it creates a symlink with the name "current" next to the directory it creates.
     symlink_path = tmp_path.parent / (tmp_path.name[:-1] + "current")
-    assert symlink_path.is_symlink() is True
+    if not symlink_path.is_symlink():  # pragma: no cover
+        pytest.skip("Symlinks not supported in this environment")
 
     # Create test file.
     tmp_path.joinpath("test_foo.py").write_text("def test(): pass", encoding="UTF-8")