floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1782 from nicoddemus/invocation-fixtures-help 

invocation-scoped fixtures show up once with --fixtures
This commit is contained in:
Raphael Pierzina 2016-08-01 23:21:28 +01:00 committed by GitHub
parent b380eb5b34 44ecf2ab2f
commit 226f2795ba
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
_pytest/python.py
View File

@ -1014,16 +1014,26 @@ def _showfixtures_main(config, session):
fm = session._fixturemanager
available = []
seen = set()
for argname, fixturedefs in fm._arg2fixturedefs.items():
assert fixturedefs is not None
if not fixturedefs:
continue
for fixturedef in fixturedefs:
loc = getlocation(fixturedef.func, curdir)
fixture_argname = fixturedef.argname
# invocation-scoped fixtures have argname in the form
# "<name>:<scope>" (for example: "monkeypatch:session").
if ':' in fixture_argname:
fixture_argname = fixture_argname.split(':')[0]
if (fixture_argname, loc) in seen:
continue
seen.add((fixture_argname, loc))
available.append((len(fixturedef.baseid),
fixturedef.func.__module__,
curdir.bestrelpath(loc),
fixturedef.argname, fixturedef))
fixture_argname, fixturedef))
available.sort()
currentmodule = None

7
testing/python/fixture.py
View File

@ -2725,6 +2725,13 @@ class TestShowFixtures:
Hi from test module
''')
def test_show_invocation_fixtures(self, testdir):
"""py.test --fixtures should display invocation-scoped fixtures once.
"""
result = testdir.runpytest("--fixtures")
result.stdout.fnmatch_lines('''monkeypatch''')
assert 'monkeypatch:session' not in result.stdout.str()
@pytest.mark.parametrize('flavor', ['fixture', 'yield_fixture'])
class TestContextManagerFixtureFuncs: