From 2670dac0d243b0c33f5313ab50ffadc0ec285589 Mon Sep 17 00:00:00 2001
From: arigo <none@none>
Date: Fri, 12 Sep 2008 21:54:41 +0200
Subject: [PATCH] [svn r58093] (pedronis, arigo) Show tracebacks for the
 failures even when py.test is interrupted by Ctrl-C.

--HG--
branch : trunk
---
 py/test/report/terminal.py              |  7 +++----
 py/test/report/testing/test_terminal.py | 23 +++++++++++++++++++++++
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/py/test/report/terminal.py b/py/test/report/terminal.py
index 62787fbcc..10ea0f649 100644
--- a/py/test/report/terminal.py
+++ b/py/test/report/terminal.py
@@ -129,10 +129,9 @@ class TerminalReporter(BaseReporter):
 
     def rep_TestrunFinish(self, ev):
         self._tw.line("")
-        if ev.exitstatus == 0 or ev.exitstatus == 1:
-            self.summary_failures()
-            self.summary_skips()
-        elif ev.exitstatus == 2:
+        self.summary_failures()
+        self.summary_skips()
+        if ev.exitstatus == 2:
             self.write_sep("!", "KEYBOARD INTERRUPT")
         self.summary_deselected()
         self.summary_stats()
diff --git a/py/test/report/testing/test_terminal.py b/py/test/report/testing/test_terminal.py
index 632159425..827bae738 100644
--- a/py/test/report/testing/test_terminal.py
+++ b/py/test/report/testing/test_terminal.py
@@ -206,3 +206,26 @@ class TestTerminal(InlineCollection):
         s = popvalue(stringio) 
         print s
         assert s.find("test_show_path_before_running_test.py") != -1
+
+    def test_keyboard_interrupt(self):
+        modcol = self.getmodulecol("""
+            def test_foobar():
+                assert 0
+            def test_spamegg():
+                import py; py.test.skip('skip me please!')
+        """, configargs=("--showskipsummary",), withsession=True)
+        stringio = py.std.cStringIO.StringIO()
+        rep = TerminalReporter(modcol._config, bus=self.session.bus, file=stringio)
+        rep.processevent(event.TestrunStart())
+        for item in self.session.genitems([modcol]):
+            ev = basic_run_report(item) 
+            rep.processevent(ev)
+        s = popvalue(stringio)
+        assert s.find("test_keyboard_interrupt.py Fs") != -1
+        rep.processevent(event.TestrunFinish(exitstatus=2))
+        assert_stringio_contains_lines(stringio, [
+            "    def test_foobar():",
+            ">       assert 0",
+            "E       assert 0",
+        ])
+        assert "Skipped: 'skip me please!'" in stringio.getvalue()