Merged revisions 81728 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r81728 | michael.foord | 2010-06-05 12:23:51 +0100 (Sat, 05 Jun 2010) | 1 line
Issue 8351. Suppress large diffs in unittest.TestCase.assertSequenceEqual.
........
diff --git a/Lib/unittest/case.py b/Lib/unittest/case.py
index a072cf1..4a13f0a 100644
--- a/Lib/unittest/case.py
+++ b/Lib/unittest/case.py
@@ -12,7 +12,7 @@
unorderable_list_difference)
__unittest = True
-
+TRUNCATED_DIFF = '\n[diff truncated...]'
class SkipTest(Exception):
"""
@@ -599,7 +599,8 @@
failUnlessRaises = _deprecate(assertRaises)
failIf = _deprecate(assertFalse)
- def assertSequenceEqual(self, seq1, seq2, msg=None, seq_type=None):
+ def assertSequenceEqual(self, seq1, seq2, msg=None, seq_type=None,
+ max_diff=80*8):
"""An equality assertion for ordered sequences (like lists and tuples).
For the purposes of this function, a valid ordered sequence type is one
@@ -612,6 +613,7 @@
datatype should be enforced.
msg: Optional message to use on failure instead of a list of
differences.
+ max_diff: Maximum size off the diff, larger diffs are not shown
"""
if seq_type != None:
seq_type_name = seq_type.__name__
@@ -694,9 +696,14 @@
except (TypeError, IndexError, NotImplementedError):
differing += ('Unable to index element %d '
'of second %s\n' % (len1, seq_type_name))
- standardMsg = differing + '\n' + '\n'.join(
+ standardMsg = differing
+ diffMsg = '\n' + '\n'.join(
difflib.ndiff(pprint.pformat(seq1).splitlines(),
pprint.pformat(seq2).splitlines()))
+ if max_diff is None or len(diffMsg) <= max_diff:
+ standardMsg += diffMsg
+ else:
+ standardMsg += diffMsg[:max_diff] + TRUNCATED_DIFF
msg = self._formatMessage(msg, standardMsg)
self.fail(msg)