Skip to content

Commit

Permalink
Merge pull request #1 from kvas-it/features
Browse files Browse the repository at this point in the history
Factor setuponly code out of runtestprotocol().
  • Loading branch information
sallner committed Jun 22, 2016
2 parents 92bcc36 + 6874c3a commit de9ed5e
Showing 1 changed file with 12 additions and 8 deletions.
20 changes: 12 additions & 8 deletions _pytest/runner.py
Expand Up @@ -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,
Expand All @@ -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)

Expand Down

0 comments on commit de9ed5e

Please sign in to comment.