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

Merge pull request #1811 from nicoddemus/revert-invocation-fixtures

Browse Source 
Revert invocation-fixtures code
This commit is contained in:
Florian Bruhin
2016-08-17 20:32:54 +02:00
committed by GitHub
parent 09e647c7d9 707b6b5e3f
commit c8ab79402c
10 changed files with 31 additions and 425 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
_pytest/python.py
View File

@@ -1008,7 +1008,6 @@ def showfixtures(config):
def _showfixtures_main(config, session):
import _pytest.config
from _pytest.fixtures import strip_invocation_scope_suffix
session.perform_collect()
curdir = py.path.local()
tw = _pytest.config.create_terminal_writer(config)
@@ -1025,16 +1024,13 @@ def _showfixtures_main(config, session):
continue
for fixturedef in fixturedefs:
loc = getlocation(fixturedef.func, curdir)
# invocation-scoped fixtures have argname in the form
# "<name>:<scope>" (for example: "monkeypatch:session").
fixture_argname = strip_invocation_scope_suffix(fixturedef.argname)
if (fixture_argname, loc) in seen:
if (fixturedef.argname, loc) in seen:
continue
seen.add((fixture_argname, loc))
seen.add((fixturedef.argname, loc))
available.append((len(fixturedef.baseid),
fixturedef.func.__module__,
curdir.bestrelpath(loc),
fixture_argname, fixturedef))
fixturedef.argname, fixturedef))
available.sort()
currentmodule = None