Add tests for get_return_annotation

Author: kianelbo

src/_pytest/fixtures.py

@@ -1915,7 +1915,7 @@ def write_fixture(fixture_def: FixtureDef[object]) -> None:
             return
         prettypath = _pretty_fixture_path(invocation_dir, fixture_def.func)
         tw.write(f"{argname}", green=True)
-        ret_annotation = get_return_annotation(fixture_def)
+        ret_annotation = get_return_annotation(fixture_def.func)
         if ret_annotation:
             tw.write(f" -> {ret_annotation}", cyan=True)
         tw.write(f" -- {prettypath}", yellow=True)
@@ -2002,7 +2002,7 @@ def _showfixtures_main(config: Config, session: Session) -> None:
         if verbose <= 0 and argname.startswith("_"):
             continue
         tw.write(f"{argname}", green=True)
-        ret_annotation = get_return_annotation(fixturedef)
+        ret_annotation = get_return_annotation(fixturedef.func)
         if ret_annotation:
             tw.write(f" -> {ret_annotation}", cyan=True)
         if fixturedef.scope != "function":
@@ -2019,12 +2019,12 @@ def _showfixtures_main(config: Config, session: Session) -> None:
         tw.line()
 
 
-def get_return_annotation(fixturedef: FixtureDef[object]) -> str:
+def get_return_annotation(fixture_func: Callable) -> str:
     try:
-        sig = signature(fixturedef.func)
+        sig = signature(fixture_func)
         annotation = sig.return_annotation
         if annotation is not sig.empty and annotation != inspect._empty:
-            return inspect.formatannotation(annotation)
+            return inspect.formatannotation(annotation).replace("'", "")
     except (ValueError, TypeError):
         pass
     return ""

testing/python/fixtures.py

@@ -5,10 +5,12 @@
 from pathlib import Path
 import sys
 import textwrap
+from typing import Tuple
 
 from _pytest.compat import getfuncargnames
 from _pytest.config import ExitCode
 from _pytest.fixtures import deduplicate_names
+from _pytest.fixtures import get_return_annotation
 from _pytest.fixtures import TopRequest
 from _pytest.monkeypatch import MonkeyPatch
 from _pytest.pytester import get_public_names
@@ -3634,7 +3636,6 @@ def six() -> int:
         result = pytester.runpytest("--fixtures", p)
         result.stdout.fnmatch_lines(
             """
-            *tmp_path* -- *
             *fixtures defined from*
             *six -> int -- test_show_fixtures_return_annotation.py:3*
         """
@@ -5086,3 +5087,20 @@ def test_method(self, /, fix):
     )
     result = pytester.runpytest()
     result.assert_outcomes(passed=1)
+
+def test_get_return_annotation() -> None:
+    def six() -> int:
+        return 6
+    assert get_return_annotation(six) == "int"
+
+    def two_sixes() -> Tuple[int, str]:
+        return (6, "six")
+    assert get_return_annotation(two_sixes) == "Tuple[int, str]"
+
+    def no_annot():
+        return 6
+    assert get_return_annotation(no_annot) == ""
+
+    def none_return() -> None:
+        pass
+    assert get_return_annotation(none_return) == "None"