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

Factor setuponly code out of runtestprotocol().

This commit is contained in:
Vasily Kuznetsov 2016-06-22 11:09:54 +02:00
parent 499c9551c8
commit 6874c3a3cc
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
_pytest/runner.py
View File

@ -74,14 +74,7 @@ def runtestprotocol(item, log=True, nextitem=None):
reports = [rep]
if rep.passed:
if item.config.option.setuponly:
tw = item.config.get_terminal_writer()
tw.line()
tw.write(' ' * 8)
tw.write('{} '.format(item._nodeid))
used_fixtures = sorted(item._fixtureinfo.name2fixturedefs.keys())
if used_fixtures:
tw.write('fixtures: ')
tw.write(', '.join(used_fixtures))
show_test_item(item)
else:
reports.append(call_and_report(item, "call", log))
reports.append(call_and_report(item, "teardown", log,
@ -93,6 +86,17 @@ def runtestprotocol(item, log=True, nextitem=None):
item.funcargs = None
return reports
def show_test_item(item):
"""Show test function, parameters and the fixtures of the test item."""
tw = item.config.get_terminal_writer()
tw.line()
tw.write(' ' * 8)
tw.write('{} '.format(item._nodeid))
used_fixtures = sorted(item._fixtureinfo.name2fixturedefs.keys())
if used_fixtures:
tw.write('fixtures: ')
tw.write(', '.join(used_fixtures))
def pytest_runtest_setup(item):
item.session._setupstate.prepare(item)