From: Michael Foord <michael@voidspace.org.uk>
Date: Sun, 8 Sep 2013 03:34:27 +0000 (+1200)
Subject: Closes issue 14971.
X-Git-Tag: v2.7.6rc1~165
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=050e9e5c59f84be160d15e8357f56c7c16e44450;p=thirdparty%2FPython%2Fcpython.git

Closes issue 14971.
 unittest test discovery no longer gets confused when a function
has a different __name__ than its name in the TestCase class dictionary.
---

diff --git a/Lib/unittest/loader.py b/Lib/unittest/loader.py
index e88f536b394a..c6fc6630de1a 100644
--- a/Lib/unittest/loader.py
+++ b/Lib/unittest/loader.py
@@ -106,7 +106,9 @@ class TestLoader(object):
         elif (isinstance(obj, types.UnboundMethodType) and
               isinstance(parent, type) and
               issubclass(parent, case.TestCase)):
-            return self.suiteClass([parent(obj.__name__)])
+            name = parts[-1]
+            inst = parent(name)
+            return self.suiteClass([inst])
         elif isinstance(obj, suite.TestSuite):
             return obj
         elif hasattr(obj, '__call__'):
diff --git a/Lib/unittest/test/test_loader.py b/Lib/unittest/test/test_loader.py
index d8d52f7c0df1..3e9756e65ae7 100644
--- a/Lib/unittest/test/test_loader.py
+++ b/Lib/unittest/test/test_loader.py
@@ -1281,6 +1281,21 @@ class Test_TestLoader(unittest.TestCase):
         loader = unittest.TestLoader()
         self.assertTrue(loader.suiteClass is unittest.TestSuite)
 
+    # Make sure the dotted name resolution works even if the actual
+    # function doesn't have the same name as is used to find it.
+    def test_loadTestsFromName__function_with_different_name_than_method(self):
+        # lambdas have the name '<lambda>'.
+        m = types.ModuleType('m')
+        class MyTestCase(unittest.TestCase):
+            test = lambda: 1
+        m.testcase_1 = MyTestCase
+
+        loader = unittest.TestLoader()
+        suite = loader.loadTestsFromNames(['testcase_1.test'], m)
+        self.assertIsInstance(suite, loader.suiteClass)
+
+        ref_suite = unittest.TestSuite([MyTestCase('test')])
+        self.assertEqual(list(suite), [ref_suite])
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/Misc/NEWS b/Misc/NEWS
index 53be4c14ffb1..3956628edb3c 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -32,6 +32,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #14971: unittest test discovery no longer gets confused when a function
+  has a different __name__ than its name in the TestCase class dictionary.
+
 - Issue #18672: Fixed format specifiers for Py_ssize_t in debugging output in
   the _sre moduel.