diff options
| author | Michael Foord <fuzzyman@voidspace.org.uk> | 2010-05-08 17:10:05 (GMT) |
|---|---|---|
| committer | Michael Foord <fuzzyman@voidspace.org.uk> | 2010-05-08 17:10:05 (GMT) |
| commit | 73162197aae715815faf90060f1df5636db99ed0 (patch) | |
| tree | 8904c78d988c3993ae942f1ebe9eb19f9d13a4be /Lib/unittest/suite.py | |
| parent | 06507eb7914a604343603505d2ccacdbd91c4f38 (diff) | |
| download | cpython-73162197aae715815faf90060f1df5636db99ed0.zip cpython-73162197aae715815faf90060f1df5636db99ed0.tar.gz cpython-73162197aae715815faf90060f1df5636db99ed0.tar.bz2 | |
Merged revisions 80997 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r80997 | michael.foord | 2010-05-08 19:06:25 +0200 (Sat, 08 May 2010) | 1 line
unittest: issue 8301. Adding functions to test suites no longer crashes.
........
Diffstat (limited to 'Lib/unittest/suite.py')
| -rw-r--r-- | Lib/unittest/suite.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Lib/unittest/suite.py b/Lib/unittest/suite.py index 72b2949..a723852 100644 --- a/Lib/unittest/suite.py +++ b/Lib/unittest/suite.py @@ -116,7 +116,12 @@ class TestSuite(BaseTestSuite): if getattr(currentClass, "__unittest_skip__", False): return - currentClass._classSetupFailed = False + try: + currentClass._classSetupFailed = False + except TypeError: + # test may actually be a function + # so its class will be a builtin-type + pass setUpClass = getattr(currentClass, 'setUpClass', None) if setUpClass is not None: |