From: Michael Foord <fuzzyman@voidspace.org.uk>
Date: Sat, 8 May 2010 17:06:25 +0000 (+0000)
Subject: unittest: issue 8301. Adding functions to test suites no longer crashes.
X-Git-Tag: v2.7b2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9c164af6c35cc0a0b21162d74bd7ea572731ed2c;p=thirdparty%2FPython%2Fcpython.git

unittest: issue 8301. Adding functions to test suites no longer crashes.
---

diff --git a/Lib/unittest/suite.py b/Lib/unittest/suite.py
index 0dd2dc56f1a4..cf6d94a4026b 100644
--- a/Lib/unittest/suite.py
+++ b/Lib/unittest/suite.py
@@ -119,7 +119,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:
diff --git a/Lib/unittest/test/test_suite.py b/Lib/unittest/test/test_suite.py
index 7cd2b897679c..2b8d678ca365 100644
--- a/Lib/unittest/test/test_suite.py
+++ b/Lib/unittest/test/test_suite.py
@@ -290,6 +290,15 @@ class Test_TestSuite(unittest.TestCase, TestEquality):
         suite = unittest.TestSuite()
         self.assertRaises(TypeError, suite.addTests, "foo")
 
+    def test_function_in_suite(self):
+        def f(_):
+            pass
+        suite = unittest.TestSuite()
+        suite.addTest(f)
+
+        # when the bug is fixed this line will not crash
+        suite.run(unittest.TestResult())
+
 
 if __name__ == '__main__':
     unittest.main()