Merge branch 'master' into 'features'

2016-01-08 21:51:34 -02:00
parent eebf5c1d2c 29b05c8391
commit b8784c28c9
4 changed files with 25 additions and 5 deletions
--- a/_pytest/terminal.py
+++ b/_pytest/terminal.py
@@ -365,15 +365,14 @@ class TerminalReporter:
            EXIT_OK, EXIT_TESTSFAILED, EXIT_INTERRUPTED, EXIT_USAGEERROR,
            EXIT_NOTESTSCOLLECTED)
        if exitstatus in summary_exit_codes:
+            self.config.hook.pytest_terminal_summary(terminalreporter=self)
            self.summary_errors()
            self.summary_failures()
            self.summary_warnings()
            self.summary_passes()
-            self.config.hook.pytest_terminal_summary(terminalreporter=self)
        if exitstatus == EXIT_INTERRUPTED:
            self._report_keyboardinterrupt()
            del self._keyboardinterrupt_memo
-
        self.summary_deselected()
        self.summary_stats()