Index: lldb/trunk/third_party/Python/module/unittest2/unittest2/loader.py
===================================================================
--- lldb/trunk/third_party/Python/module/unittest2/unittest2/loader.py
+++ lldb/trunk/third_party/Python/module/unittest2/unittest2/loader.py
@@ -117,7 +117,7 @@
             return self.loadTestsFromModule(obj)
         elif isinstance(obj, type) and issubclass(obj, unittest.TestCase):
             return self.loadTestsFromTestCase(obj)
-        elif (isinstance(obj, types.UnboundMethodType) and
+        elif (isinstance(obj, (types.MethodType, types.FunctionType)) and
               isinstance(parent, type) and
               issubclass(parent, case.TestCase)):
             return self.suiteClass([parent(obj.__name__)])