Show fixture scopes with --fixtures, except for "function" scope

Fix #5220
pytest-dev · May 7, 2019 · 6d04037 · 6d04037
1 parent 4a2fdce
commit 6d04037
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 6 deletions.
diff --git a/changelog/5220.feature.rst b/changelog/5220.feature.rst
@@ -0,0 +1 @@
+``--fixtures`` now also shows fixture scope for scopes other than ``"function"``.
diff --git a/src/_pytest/python.py b/src/_pytest/python.py
@@ -1342,17 +1342,19 @@ def _showfixtures_main(config, session):
                 currentmodule = module
         if verbose <= 0 and argname[0] == "_":
             continue
+        tw.write(argname, green=True)
+        if fixturedef.scope != "function":
+            tw.write(" [%s scope]" % fixturedef.scope, cyan=True)
         if verbose > 0:
-            funcargspec = "%s -- %s" % (argname, bestrel)
-        else:
-            funcargspec = argname
-        tw.line(funcargspec, green=True)
+            tw.write(" -- %s" % bestrel, yellow=True)
+        tw.write("\n")
         loc = getlocation(fixturedef.func, curdir)
         doc = fixturedef.func.__doc__ or ""
         if doc:
             write_docstring(tw, doc)
         else:
             tw.line("    %s: no docstring available" % (loc,), red=True)
+        tw.line()
 
 
 def write_docstring(tw, doc, indent="    "):

diff --git a/testing/python/fixtures.py b/testing/python/fixtures.py
@@ -3037,11 +3037,25 @@ def test_funcarg_compat(self, testdir):
 
     def test_show_fixtures(self, testdir):
         result = testdir.runpytest("--fixtures")
-        result.stdout.fnmatch_lines(["*tmpdir*", "*temporary directory*"])
+        result.stdout.fnmatch_lines(
+            [
+                "tmpdir_factory [[]session scope[]]",
+                "*for the test session*",
+                "tmpdir",
+                "*temporary directory*",
+            ]
+        )
 
     def test_show_fixtures_verbose(self, testdir):
         result = testdir.runpytest("--fixtures", "-v")
-        result.stdout.fnmatch_lines(["*tmpdir*--*tmpdir.py*", "*temporary directory*"])
+        result.stdout.fnmatch_lines(
+            [
+                "tmpdir_factory [[]session scope[]] -- *tmpdir.py*",
+                "*for the test session*",
+                "tmpdir -- *tmpdir.py*",
+                "*temporary directory*",
+            ]
+        )
 
     def test_show_fixtures_testmodule(self, testdir):
         p = testdir.makepyfile(
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		``--fixtures`` now also shows fixture scope for scopes other than ``"function"``.