summaryrefslogtreecommitdiffstats
path: root/Lib/unittest/suite.py
diff options
context:
space:
mode:
authorMichael Foord <fuzzyman@voidspace.org.uk>2010-06-05 20:59:00 (GMT)
committerMichael Foord <fuzzyman@voidspace.org.uk>2010-06-05 20:59:00 (GMT)
commitdb919f01884e8c93506db7d54325d4e68e61861b (patch)
tree93bb00af45ddfa1b07df67e95ef362e982c8ad4e /Lib/unittest/suite.py
parentc1d7c5b7fab5709f1c59f53463aab8ae359cbe8c (diff)
downloadcpython-db919f01884e8c93506db7d54325d4e68e61861b.zip
cpython-db919f01884e8c93506db7d54325d4e68e61861b.tar.gz
cpython-db919f01884e8c93506db7d54325d4e68e61861b.tar.bz2
Tests for issue 8302, skipped test in a setUpClass or a setUpModule are reported as skips rather than errors.
Diffstat (limited to 'Lib/unittest/suite.py')
-rw-r--r--Lib/unittest/suite.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/unittest/suite.py b/Lib/unittest/suite.py
index 74d5800..bed9044 100644
--- a/Lib/unittest/suite.py
+++ b/Lib/unittest/suite.py
@@ -133,7 +133,7 @@ class TestSuite(BaseTestSuite):
except Exception as e:
currentClass._classSetupFailed = True
className = util.strclass(currentClass)
- errorName = 'classSetUp (%s)' % className
+ errorName = 'setUpClass (%s)' % className
self._addClassOrModuleLevelException(result, e, errorName)
@@ -213,7 +213,7 @@ class TestSuite(BaseTestSuite):
tearDownClass()
except Exception, e:
className = util.strclass(previousClass)
- errorName = 'classTearDown (%s)' % className
+ errorName = 'tearDownClass (%s)' % className
self._addClassOrModuleLevelException(result, e, errorName)