summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Doc/library/unittest.rst4
-rw-r--r--Lib/unittest/case.py2
-rw-r--r--Lib/unittest/test/test_assertions.py2
-rw-r--r--Misc/NEWS3
4 files changed, 7 insertions, 4 deletions
diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
index db6c53f..2b9c2be 100644
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -1305,8 +1305,8 @@ Test cases
to ``True`` allows you to have a custom error message in addition to the
normal one.
- This attribute defaults to ``False``, meaning that a custom message passed
- to an assert method will silence the normal message.
+ This attribute defaults to ``True``. If set to False then a custom message
+ passed to an assert method will silence the normal message.
The class setting can be overridden in individual tests by assigning an
instance attribute to ``True`` or ``False`` before calling the assert methods.
diff --git a/Lib/unittest/case.py b/Lib/unittest/case.py
index bb337f1..227879c 100644
--- a/Lib/unittest/case.py
+++ b/Lib/unittest/case.py
@@ -245,7 +245,7 @@ class TestCase(object):
# objects used in assert methods) will be printed on failure in *addition*
# to any explicit message passed.
- longMessage = False
+ longMessage = True
# This attribute sets the maximum length of a diff in failure messages
# by assert methods using difflib. It is looked up as an instance attribute
diff --git a/Lib/unittest/test/test_assertions.py b/Lib/unittest/test/test_assertions.py
index 0ee7edb..69572ee 100644
--- a/Lib/unittest/test/test_assertions.py
+++ b/Lib/unittest/test/test_assertions.py
@@ -127,7 +127,7 @@ class TestLongMessage(unittest.TestCase):
self.testableFalse = TestableTestFalse('testTest')
def testDefault(self):
- self.assertFalse(unittest.TestCase.longMessage)
+ self.assertTrue(unittest.TestCase.longMessage)
def test_formatMsg(self):
self.assertEqual(self.testableFalse._formatMessage(None, "foo"), "foo")
diff --git a/Misc/NEWS b/Misc/NEWS
index b0975f8..e856c6d 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@ What's New in Python 3.2 Beta 1?
Core and Builtins
-----------------
+- Issue 7911: `unittest.TestCase.longMessage` defaults to True for improved
+ failure messages by default. Patch by Mark Roddy.
+
- Issue #9915: Speed up sorting with a key.
- Issue #9333: Expose os.symlink only when the SeCreateSymbolicLinkPrivilege