Merged revisions 77815 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77815 | r.david.murray | 2010-01-28 16:16:33 -0500 (Thu, 28 Jan 2010) | 3 lines

  Change error report when the object passed to suite.addTest is not
  callable to include the repr of the invalid object.
........

diff --git a/Lib/unittest/suite.py b/Lib/unittest/suite.py
index 8672aab3ad11997bc6fd15458f281a09fbb126cc..35b7d91da3a7d6d9cffc9ee8ae1d7a2210bd615f 100644 (file)
--- a/Lib/unittest/suite.py
+++ b/Lib/unittest/suite.py
@@ -40,7 +40,7 @@ class TestSuite(object):
     def addTest(self, test):
         # sanity checks
         if not hasattr(test, '__call__'):
-            raise TypeError("the test to add must be callable")
+            raise TypeError("{} is not callable".format(repr(test)))
         if isinstance(test, type) and issubclass(test,
                                                  (case.TestCase, TestSuite)):
             raise TypeError("TestCases and TestSuites must be instantiated "