Skip to content

Commit de9ed5e

Browse files
authored
Merge pull request #1 from kvas-it/features
Factor setuponly code out of runtestprotocol().
2 parents 92bcc36 + 6874c3a commit de9ed5e

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

_pytest/runner.py

+12-8
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,7 @@ def runtestprotocol(item, log=True, nextitem=None):
7474
reports = [rep]
7575
if rep.passed:
7676
if item.config.option.setuponly:
77-
tw = item.config.get_terminal_writer()
78-
tw.line()
79-
tw.write(' ' * 8)
80-
tw.write('{} '.format(item._nodeid))
81-
used_fixtures = sorted(item._fixtureinfo.name2fixturedefs.keys())
82-
if used_fixtures:
83-
tw.write('fixtures: ')
84-
tw.write(', '.join(used_fixtures))
77+
show_test_item(item)
8578
else:
8679
reports.append(call_and_report(item, "call", log))
8780
reports.append(call_and_report(item, "teardown", log,
@@ -93,6 +86,17 @@ def runtestprotocol(item, log=True, nextitem=None):
9386
item.funcargs = None
9487
return reports
9588

89+
def show_test_item(item):
90+
"""Show test function, parameters and the fixtures of the test item."""
91+
tw = item.config.get_terminal_writer()
92+
tw.line()
93+
tw.write(' ' * 8)
94+
tw.write('{} '.format(item._nodeid))
95+
used_fixtures = sorted(item._fixtureinfo.name2fixturedefs.keys())
96+
if used_fixtures:
97+
tw.write('fixtures: ')
98+
tw.write(', '.join(used_fixtures))
99+
96100
def pytest_runtest_setup(item):
97101
item.session._setupstate.prepare(item)
98102

0 commit comments

Comments
 (0)