[Python-checkins] r80999 - in python/branches/py3k: Lib/unittest/suite.py Lib/unittest/test/test_suite.py

[michael.foord]

Author: michael.foord
Date: Sat May  8 19:10:05 2010
New Revision: 80999

Log:
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.
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/unittest/suite.py
   python/branches/py3k/Lib/unittest/test/test_suite.py

Modified: python/branches/py3k/Lib/unittest/suite.py
==============================================================================
--- python/branches/py3k/Lib/unittest/suite.py	(original)
+++ python/branches/py3k/Lib/unittest/suite.py	Sat May  8 19:10:05 2010
@@ -116,7 +116,12 @@
         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:

Modified: python/branches/py3k/Lib/unittest/test/test_suite.py
==============================================================================
--- python/branches/py3k/Lib/unittest/test/test_suite.py	(original)
+++ python/branches/py3k/Lib/unittest/test/test_suite.py	Sat May  8 19:10:05 2010
@@ -289,3 +289,16 @@
     def test_addTests__string(self):
         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()