Improve get_return_annotation logic

Author: kianelbo

changelog/13676.improvement.rst

@@ -1 +1 @@
-Added return type annotations in ``fixtures`` and ``fixtures-per-test``.
+Return type annotations are now shown in ``--fixtures`` and ``--fixtures-per-test``.

src/_pytest/fixtures.py

@@ -2019,8 +2019,12 @@ def get_return_annotation(fixture_func: Callable[..., Any]) -> str:
     try:
         sig = signature(fixture_func)
         annotation = sig.return_annotation
-        if annotation is not sig.empty and annotation != inspect._empty:
-            return inspect.formatannotation(annotation).replace("'", "")
+        if annotation is not sig.empty:
+            if isinstance(annotation, str):
+                return annotation
+            if annotation.__module__ == "typing":
+                return str(annotation).replace("typing.", "")
+            return annotation.__name__
     except (ValueError, TypeError):
         pass
     return ""

testing/python/fixtures.py

@@ -6,6 +6,7 @@
 from pathlib import Path
 import sys
 import textwrap
+from typing import Any, Callable
 
 from _pytest.compat import getfuncargnames
 from _pytest.config import ExitCode
@@ -5100,14 +5101,31 @@ def two_sixes() -> tuple[int, str]:
 
     assert get_return_annotation(two_sixes) == "tuple[int, str]"
 
-    def no_annot():
+    def callable_return() -> Callable[..., Any]:
+        return two_sixes
+
+    assert get_return_annotation(callable_return) == "Callable[..., Any]"
+
+    def no_annotation():
         return 6
 
-    assert get_return_annotation(no_annot) == ""
+    assert get_return_annotation(no_annotation) == ""
 
     def none_return() -> None:
         pass
 
     assert get_return_annotation(none_return) == "None"
 
+    class T:
+        pass
+    def class_return() -> T:
+        return T()
+    
+    assert get_return_annotation(class_return) == "T"
+
+    def enum_return() -> ExitCode:
+        return ExitCode(0)
+    
+    assert get_return_annotation(enum_return) == "ExitCode"
+
     assert get_return_annotation(range) == ""

testing/python/show_fixtures_per_test.py

@@ -160,6 +160,30 @@ def test_args(arg2, arg3):
     )
 
 
+def test_show_return_annotation(pytester: Pytester) -> None:
+    p = pytester.makepyfile(
+        '''
+        import pytest
+        @pytest.fixture
+        def five() -> int:
+            return 5
+        def test_five(five):
+            pass
+    '''
+    )
+
+    result = pytester.runpytest("--fixtures-per-test", p)
+    assert result.ret == 0
+
+    result.stdout.fnmatch_lines(
+        [
+            "*fixtures used by test_five*",
+            "*(test_show_return_annotation.py:6)*",
+            "five -> int -- test_show_return_annotation.py:3",
+        ]
+    )
+
+
 def test_doctest_items(pytester: Pytester) -> None:
     pytester.makepyfile(
         '''