From 3a8696cd9af55da44e12a2fc0b43b1c01fe436d8 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <me@the-compiler.org>
Date: Fri, 9 Feb 2024 14:59:04 +0100
Subject: [PATCH] [8.0.x] Improve error message when using @pytest.fixture
 twice

---
 src/_pytest/fixtures.py    |  2 +-
 testing/python/fixtures.py | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/_pytest/fixtures.py b/src/_pytest/fixtures.py
index dabdf0e4283..206fd084ae4 100644
--- a/src/_pytest/fixtures.py
+++ b/src/_pytest/fixtures.py
@@ -1196,7 +1196,7 @@ def __call__(self, function: FixtureFunction) -> FixtureFunction:
 
         if getattr(function, "_pytestfixturefunction", False):
             raise ValueError(
-                "fixture is being applied more than once to the same function"
+                f"@pytest.fixture is being applied more than once to the same function {function.__name__!r}"
             )
 
         if hasattr(function, "pytestmark"):
diff --git a/testing/python/fixtures.py b/testing/python/fixtures.py
index 5512b602dc7..37c09a9bd8a 100644
--- a/testing/python/fixtures.py
+++ b/testing/python/fixtures.py
@@ -4352,6 +4352,27 @@ def fix():
         assert fix() == 1
 
 
+def test_fixture_double_decorator(pytester: Pytester) -> None:
+    """Check if an error is raised when using @pytest.fixture twice."""
+    pytester.makepyfile(
+        """
+        import pytest
+
+        @pytest.fixture
+        @pytest.fixture
+        def fixt():
+            pass
+        """
+    )
+    result = pytester.runpytest()
+    result.assert_outcomes(errors=1)
+    result.stdout.fnmatch_lines(
+        [
+            "E * ValueError: @pytest.fixture is being applied more than once to the same function 'fixt'"
+        ]
+    )
+
+
 def test_fixture_param_shadowing(pytester: Pytester) -> None:
     """Parametrized arguments would be shadowed if a fixture with the same name also exists (#5036)"""
     pytester.makepyfile(