Show return type annotations in fixtures

Author: kianelbo

src/_pytest/fixtures.py

@@ -1911,6 +1911,9 @@ 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)
+        if ret_annotation:
+            tw.write(f" -> {ret_annotation}", cyan=True)
         tw.write(f" -- {prettypath}", yellow=True)
         tw.write("\n")
         fixture_doc = inspect.getdoc(fixture_def.func)
@@ -1995,6 +1998,9 @@ 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)
+        if ret_annotation:
+            tw.write(f" -> {ret_annotation}", cyan=True)
         if fixturedef.scope != "function":
             tw.write(f" [{fixturedef.scope} scope]", cyan=True)
         tw.write(f" -- {prettypath}", yellow=True)
@@ -2009,6 +2015,17 @@ def _showfixtures_main(config: Config, session: Session) -> None:
         tw.line()
 
 
+def get_return_annotation(fixturedef: FixtureDef[object]) -> str:
+    try:
+        sig = signature(fixturedef.func)
+        annotation = sig.return_annotation
+        if annotation is not sig.empty and annotation != inspect._empty:
+            return inspect.formatannotation(annotation)
+    except (ValueError, TypeError):
+        pass
+    return ""
+
+
 def write_docstring(tw: TerminalWriter, doc: str, indent: str = "    ") -> None:
     for line in doc.split("\n"):
         tw.line(indent + line)

testing/python/fixtures.py

@@ -3582,9 +3582,9 @@ def test_show_fixtures(self, pytester: Pytester) -> None:
         result = pytester.runpytest("--fixtures")
         result.stdout.fnmatch_lines(
             [
-                "tmp_path_factory [[]session scope[]] -- .../_pytest/tmpdir.py:*",
+                "tmp_path_factory* [[]session scope[]] -- .../_pytest/tmpdir.py:*",
                 "*for the test session*",
-                "tmp_path -- .../_pytest/tmpdir.py:*",
+                "tmp_path* -- .../_pytest/tmpdir.py:*",
                 "*temporary directory*",
             ]
         )
@@ -3593,9 +3593,9 @@ def test_show_fixtures_verbose(self, pytester: Pytester) -> None:
         result = pytester.runpytest("--fixtures", "-v")
         result.stdout.fnmatch_lines(
             [
-                "tmp_path_factory [[]session scope[]] -- .../_pytest/tmpdir.py:*",
+                "tmp_path_factory* [[]session scope[]] -- .../_pytest/tmpdir.py:*",
                 "*for the test session*",
-                "tmp_path -- .../_pytest/tmpdir.py:*",
+                "tmp_path* -- .../_pytest/tmpdir.py:*",
                 "*temporary directory*",
             ]
         )
@@ -3615,14 +3615,32 @@ def arg1():
         result = pytester.runpytest("--fixtures", p)
         result.stdout.fnmatch_lines(
             """
-            *tmp_path -- *
+            *tmp_path* -- *
             *fixtures defined from*
             *arg1 -- test_show_fixtures_testmodule.py:6*
             *hello world*
         """
         )
         result.stdout.no_fnmatch_line("*arg0*")
 
+    def test_show_fixtures_return_annotation(self, pytester: Pytester) -> None:
+        p = pytester.makepyfile(
+            '''
+            import pytest
+            @pytest.fixture
+            def six() -> int:
+                return 6
+        '''
+        )
+        result = pytester.runpytest("--fixtures", p)
+        result.stdout.fnmatch_lines(
+            """
+            *tmp_path* -- *
+            *fixtures defined from*
+            *six -> int -- test_show_fixtures_return_annotation.py:3*
+        """
+        )
+
     @pytest.mark.parametrize("testmod", [True, False])
     def test_show_fixtures_conftest(self, pytester: Pytester, testmod) -> None:
         pytester.makeconftest(