mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-09 16:34:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

Merged revisions 81764 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81764 | michael.foord | 2010-06-05 21:59:00 +0100 (Sat, 05 Jun 2010) | 1 line

  Tests for issue 8302, skipped test in a setUpClass or a setUpModule are reported as skips rather than errors.
........
This commit is contained in:
Michael Foord 2010-06-05 21:12:23 +00:00
parent da562f65e9
commit 520ed0a150
3 changed files with 71 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

41
Lib/unittest/suite.py
View file

@ -127,9 +127,11 @@ class TestSuite(BaseTestSuite):
if setUpClass is not None:
try:
setUpClass()
except:
except Exception as e:
currentClass._classSetupFailed = True
self._addClassSetUpError(result, currentClass)
className = util.strclass(currentClass)
errorName = 'setUpClass (%s)' % className
self._addClassOrModuleLevelException(result, e, errorName)
def _get_previous_module(self, result):
previousModule = None
@ -157,10 +159,18 @@ class TestSuite(BaseTestSuite):
if setUpModule is not None:
try:
setUpModule()
except:
except Exception as e:
result._moduleSetUpFailed = True
error = _ErrorHolder('setUpModule (%s)' % currentModule)
result.addError(error, sys.exc_info())
errorName = 'setUpModule (%s)' % currentModule
self._addClassOrModuleLevelException(result, e, errorName)
def _addClassOrModuleLevelException(self, result, exception, errorName):
error = _ErrorHolder(errorName)
addSkip = getattr(result, 'addSkip', None)
if addSkip is not None and isinstance(exception, case.SkipTest):
addSkip(error, str(exception))
else:
result.addError(error, sys.exc_info())
def _handleModuleTearDown(self, result):
previousModule = self._get_previous_module(result)
@ -178,9 +188,9 @@ class TestSuite(BaseTestSuite):
if tearDownModule is not None:
try:
tearDownModule()
except:
error = _ErrorHolder('tearDownModule (%s)' % previousModule)
result.addError(error, sys.exc_info())
except Exception as e:
errorName = 'tearDownModule (%s)' % previousModule
self._addClassOrModuleLevelException(result, e, errorName)
def _tearDownPreviousClass(self, test, result):
previousClass = getattr(result, '_previousTestClass', None)
@ -198,18 +208,11 @@ class TestSuite(BaseTestSuite):
if tearDownClass is not None:
try:
tearDownClass()
except:
self._addClassTearDownError(result)
except Exception as e:
className = util.strclass(previousClass)
errorName = 'tearDownClass (%s)' % className
self._addClassOrModuleLevelException(result, e, errorName)
def _addClassTearDownError(self, result):
className = util.strclass(result._previousTestClass)
error = _ErrorHolder('classTearDown (%s)' % className)
result.addError(error, sys.exc_info())
def _addClassSetUpError(self, result, klass):
className = util.strclass(klass)
error = _ErrorHolder('classSetUp (%s)' % className)
result.addError(error, sys.exc_info())
class _ErrorHolder(object):