summaryrefslogtreecommitdiff
path: root/django/test/testcases.py
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2008-02-03 01:24:22 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2008-02-03 01:24:22 +0000
commite5f7ed87d4473edde8c28a073fdd670ceb020e30 (patch)
tree8d4ab338ada952dbb9f924332dc20c269e55ae71 /django/test/testcases.py
parente715ead55f4eb05a8cffe525f67f2a5a034f7217 (diff)
Fixed #6478 -- Allow tests to be interrupted with system exits and ^C. Thanks,
Bastian Kleineidam. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7056 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/test/testcases.py')
-rw-r--r--django/test/testcases.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/django/test/testcases.py b/django/test/testcases.py
index f524f1c34d..5589443aed 100644
--- a/django/test/testcases.py
+++ b/django/test/testcases.py
@@ -72,6 +72,8 @@ class TestCase(unittest.TestCase):
self.client = Client()
try:
self._pre_setup()
+ except (KeyboardInterrupt, SystemExit):
+ raise
except Exception:
import sys
result.addError(self, sys.exc_info())