Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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
  • Loading branch information...
commit cb1f413e4a154b3c5d308d3625d707685d79f912 1 parent 290d7d4
@ramiro ramiro authored
Showing with 20 additions and 21 deletions.
  1. +20 −21 django/test/testcases.py
View
41 django/test/testcases.py
@@ -283,28 +283,27 @@ def __call__(self, result=None):
include a call to super().setUp().
"""
testMethod = getattr(self, self._testMethodName)
- if (getattr(self.__class__, "__unittest_skip__", False) or
- getattr(testMethod, "__unittest_skip__", False)):
- return
-
- self.client = self.client_class()
- try:
- self._pre_setup()
- except (KeyboardInterrupt, SystemExit):
- raise
- except Exception:
- import sys
- result.addError(self, sys.exc_info())
- return
+ skipped = (getattr(self.__class__, "__unittest_skip__", False) or
+ getattr(testMethod, "__unittest_skip__", False))
+
+ if not skipped:
+ self.client = self.client_class()
+ try:
+ self._pre_setup()
+ except (KeyboardInterrupt, SystemExit):
+ raise
+ except Exception:
+ result.addError(self, sys.exc_info())
+ return
super(TransactionTestCase, self).__call__(result)
- try:
- self._post_teardown()
- except (KeyboardInterrupt, SystemExit):
- raise
- except Exception:
- import sys
- result.addError(self, sys.exc_info())
- return
+ if not skipped:
+ try:
+ self._post_teardown()
+ except (KeyboardInterrupt, SystemExit):
+ raise
+ except Exception:
+ result.addError(self, sys.exc_info())
+ return
def _post_teardown(self):
""" Performs any post-test things. This includes:
Please sign in to comment.
Something went wrong with that request. Please try again.