p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #16372 -- Changed strategy implemented in r16369 to fix #14049 to avoid affecting the statistics of test cases ran/skipped kept by unittest. Thanks zimnyx for the report. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16579 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Ramiro Morales 2011-08-02 22:30:26 +00:00
parent 290d7d4d21
commit cb1f413e4a
1 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
django/test/testcases.py
View File

@ -283,26 +283,25 @@ class TransactionTestCase(ut2.TestCase):
include a call to super().setUp(). include a call to super().setUp().
""" """
testMethod = getattr(self, self._testMethodName) testMethod = getattr(self, self._testMethodName)
if (getattr(self.__class__, "__unittest_skip__", False) or skipped = (getattr(self.__class__, "__unittest_skip__", False) or
getattr(testMethod, "__unittest_skip__", False)): getattr(testMethod, "__unittest_skip__", False))
return
if not skipped:
self.client = self.client_class() self.client = self.client_class()
try: try:
self._pre_setup() self._pre_setup()
except (KeyboardInterrupt, SystemExit): except (KeyboardInterrupt, SystemExit):
raise raise
except Exception: except Exception:
import sys
result.addError(self, sys.exc_info()) result.addError(self, sys.exc_info())
return return
super(TransactionTestCase, self).__call__(result) super(TransactionTestCase, self).__call__(result)
if not skipped:
try: try:
self._post_teardown() self._post_teardown()
except (KeyboardInterrupt, SystemExit): except (KeyboardInterrupt, SystemExit):
raise raise
except Exception: except Exception:
import sys
result.addError(self, sys.exc_info()) result.addError(self, sys.exc_info())
return return