jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Show fixture scopes with ``--fixtures``, except for "function" scope (#5221) 

Show fixture scopes with ``--fixtures``, except for "function" scope
This commit is contained in:
Bruno Oliveira 2019-05-07 19:50:53 -03:00 committed by GitHub
parent 4a2fdce62b 6d040370ed
commit 2051e30b9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog/5220.feature.rst Normal file
View File

@ -0,0 +1 @@
``--fixtures`` now also shows fixture scope for scopes other than ``"function"``.

10
src/_pytest/python.py
View File

@ -1342,17 +1342,19 @@ def _showfixtures_main(config, session):
currentmodule = module currentmodule = module
if verbose <= 0 and argname[0] == "_": if verbose <= 0 and argname[0] == "_":
continue continue
tw.write(argname, green=True)
if fixturedef.scope != "function":
tw.write(" [%s scope]" % fixturedef.scope, cyan=True)
if verbose > 0: if verbose > 0:
funcargspec = "%s -- %s" % (argname, bestrel) tw.write(" -- %s" % bestrel, yellow=True)
else: tw.write("\n")
funcargspec = argname
tw.line(funcargspec, green=True)
loc = getlocation(fixturedef.func, curdir) loc = getlocation(fixturedef.func, curdir)
doc = fixturedef.func.__doc__ or "" doc = fixturedef.func.__doc__ or ""
if doc: if doc:
write_docstring(tw, doc) write_docstring(tw, doc)
else: else:
tw.line(" %s: no docstring available" % (loc,), red=True) tw.line(" %s: no docstring available" % (loc,), red=True)
tw.line()
def write_docstring(tw, doc, indent=" "): def write_docstring(tw, doc, indent=" "):

18
testing/python/fixtures.py
View File

@ -3037,11 +3037,25 @@ class TestShowFixtures(object):
def test_show_fixtures(self, testdir): def test_show_fixtures(self, testdir):
result = testdir.runpytest("--fixtures") 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): def test_show_fixtures_verbose(self, testdir):
result = testdir.runpytest("--fixtures", "-v") 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): def test_show_fixtures_testmodule(self, testdir):
p = testdir.makepyfile( p = testdir.makepyfile(