From 12efef06357544ee81a3731899f528e9b867792a Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Fri, 18 Jan 2008 13:37:40 +0000 Subject: [PATCH] Fixed #6031 -- Added error handling for _pre_test in django.test.TestCase; exceptions during pre-test setup are now reported as test failures, rather than crashing the entire test framework. Thanks, Thomas Guttler . git-svn-id: http://code.djangoproject.com/svn/django/trunk@7023 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/test/testcases.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/django/test/testcases.py b/django/test/testcases.py index 1d65ee1d23..5b5c6f67ec 100644 --- a/django/test/testcases.py +++ b/django/test/testcases.py @@ -70,7 +70,12 @@ class TestCase(unittest.TestCase): include a call to super().setUp(). """ self.client = Client() - self._pre_setup() + try: + self._pre_setup() + except Exception: + import sys + result.addError(self, sys.exc_info()) + return super(TestCase, self).__call__(result) def assertRedirects(self, response, expected_url, status_code=302,