Added final review requested changes

Author: Gupta Arpit

changelog/12960.breaking.rst

@@ -1 +1 @@
-Test functions containing a yield now cause an explicit error. They have not been run since Pytest 4.0, and were previously marked as an expected failure and deprecation warning.
+Test functions containing a yield now cause an explicit error. They have not been run since pytest 4.0, and were previously marked as an expected failure and deprecation warning.

doc/en/deprecations.rst

@@ -374,6 +374,36 @@ an appropriate period of deprecation has passed.
 
 Some breaking changes which could not be deprecated are also listed.
 
+.. _yield tests deprecated:
+
+``yield`` tests
+~~~~~~~~~~~~~~~
+
+.. versionremoved:: 8.4
+
+pytest no longer supports ``yield``-style tests, where a test function actually ``yield`` functions and values
+that are then turned into proper test methods. Example:
+
+.. code-block:: python
+
+    def check(x, y):
+        assert x**x == y
+
+
+    def test_squared():
+        yield check, 2, 4
+        yield check, 3, 9
+
+This would result in two actual test functions being generated.
+
+This form of test function doesn't support fixtures properly, and users should switch to ``pytest.mark.parametrize``:
+
+.. code-block:: python
+
+    @pytest.mark.parametrize("x, y", [(2, 4), (3, 9)])
+    def test_squared(x, y):
+        assert x**x == y
+        
 .. _nose-deprecation:
 
 Support for tests written for nose
@@ -1270,36 +1300,6 @@ with the ``name`` parameter:
         return cell()
 
 
-.. _yield tests deprecated:
-
-``yield`` tests
-~~~~~~~~~~~~~~~
-
-.. versionremoved:: 4.0
-
-pytest supported ``yield``-style tests, where a test function actually ``yield`` functions and values
-that are then turned into proper test methods. Example:
-
-.. code-block:: python
-
-    def check(x, y):
-        assert x**x == y
-
-
-    def test_squared():
-        yield check, 2, 4
-        yield check, 3, 9
-
-This would result into two actual test functions being generated.
-
-This form of test function doesn't support fixtures properly, and users should switch to ``pytest.mark.parametrize``:
-
-.. code-block:: python
-
-    @pytest.mark.parametrize("x, y", [(2, 4), (3, 9)])
-    def test_squared(x, y):
-        assert x**x == y
-
 .. _internal classes accessed through node deprecated:
 
 Internal classes accessed through ``Node``

src/_pytest/python.py

@@ -230,8 +230,9 @@ def pytest_pycollect_makeitem(
             )
         elif getattr(obj, "__test__", True):
             if inspect.isgeneratorfunction(obj):
-                raise RuntimeError(
-                    "'yield' keyword is allowed in fixtures, but not in tests ({name})"
+                fail(
+                    f"'yield' keyword is allowed in fixtures, but not in tests ({name})",
+                    pytrace=False,
                 )
             return list(collector._genfunctions(name, obj))
         return None

testing/test_collection.py

@@ -1881,7 +1881,7 @@ def test_respect_system_exceptions(
 
 
 def test_yield_disallowed_in_tests(pytester: Pytester):
-    """Ensure generator test functions with 'yield' raise a RuntimeError."""
+    """Ensure generator test functions with 'yield' fail collection (#12960)."""
     pytester.makepyfile(
         """
         def test_with_yield():
@@ -1891,6 +1891,7 @@ def test_with_yield():
     result = pytester.runpytest()
     assert result.ret == 2
     result.stdout.fnmatch_lines(
-        ["*RuntimeError: 'yield' keyword is allowed in fixtures, but not in tests (*)*"]
+        ["*'yield' keyword is allowed in fixtures, but not in tests (test_with_yield)*"]
     )
-    result.stdout.fnmatch_lines(["*collected 0 items*"])
+    # Assert that no tests were collected
+    result.stdout.fnmatch_lines(["*collected 0 items*"])