Skip to content

Commit d3b8551

Browse files
authored
Merge pull request #1809 from blueyed/exitstatus-with-pytest_terminal_summary
Pass exitstatus to pytest_terminal_summary hook
2 parents 99a4a1a + 5b95ee3 commit d3b8551

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

_pytest/hookspec.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ def pytest_report_header(config, startdir):
269269
def pytest_report_teststatus(report):
270270
""" return result-category, shortletter and verbose word for reporting."""
271271

272-
def pytest_terminal_summary(terminalreporter):
272+
def pytest_terminal_summary(terminalreporter, exitstatus):
273273
""" add additional section in terminal summary reporting. """
274274

275275

_pytest/terminal.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,8 @@ def pytest_sessionfinish(self, exitstatus):
361361
EXIT_OK, EXIT_TESTSFAILED, EXIT_INTERRUPTED, EXIT_USAGEERROR,
362362
EXIT_NOTESTSCOLLECTED)
363363
if exitstatus in summary_exit_codes:
364-
self.config.hook.pytest_terminal_summary(terminalreporter=self)
364+
self.config.hook.pytest_terminal_summary(terminalreporter=self,
365+
exitstatus=exitstatus)
365366
self.summary_errors()
366367
self.summary_failures()
367368
self.summary_warnings()

testing/test_terminal.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -787,15 +787,17 @@ def test_error_fixture(setup_error_fixture):
787787

788788
def test_terminal_summary(testdir):
789789
testdir.makeconftest("""
790-
def pytest_terminal_summary(terminalreporter):
790+
def pytest_terminal_summary(terminalreporter, exitstatus):
791791
w = terminalreporter
792792
w.section("hello")
793793
w.line("world")
794+
w.line("exitstatus: {0}".format(exitstatus))
794795
""")
795796
result = testdir.runpytest()
796797
result.stdout.fnmatch_lines("""
797798
*==== hello ====*
798799
world
800+
exitstatus: 5
799801
""")
800802

801803

0 commit comments

Comments
 (0)