From: Neal Norwitz <nnorwitz@gmail.com>
Date: Tue, 28 Feb 2006 18:05:43 +0000 (+0000)
Subject: Instead of printing the exception when you interrupt a test (Ctrl-C),
X-Git-Tag: v2.5a0~484
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=14ca327f998511da5e89f819204c54fa582dd696;p=thirdparty%2FPython%2Fcpython.git

Instead of printing the exception when you interrupt a test (Ctrl-C),
print the status so far and suppress printing the exception (but still exit).
---

diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index 1734eba4b2c7..e7601c878178 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -334,7 +334,15 @@ def main(tests=None, testdir=None, verbose=0, quiet=False, generate=False,
             tracer.runctx('runtest(test, generate, verbose, quiet, testdir)',
                           globals=globals(), locals=vars())
         else:
-            ok = runtest(test, generate, verbose, quiet, testdir, huntrleaks)
+            try:
+                ok = runtest(test, generate, verbose, quiet, testdir,
+                             huntrleaks)
+            except KeyboardInterrupt:
+                # print a newline separate from the ^C
+                print
+                break
+            except:
+                raise
             if ok > 0:
                 good.append(test)
             elif ok == 0: