Commit 44e38d41 authored by Michael Foord's avatar Michael Foord

Merged revisions 81752 via svnmerge from

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

........
  r81752 | michael.foord | 2010-06-05 14:38:16 +0100 (Sat, 05 Jun 2010) | 1 line

  unittest.TestCase assertion methods inform you when they have omitted an over long diff on failure. Issue 8351.
........
parent 012eb8a8
...@@ -13,6 +13,10 @@ from .util import (strclass, safe_repr, sorted_list_difference, ...@@ -13,6 +13,10 @@ from .util import (strclass, safe_repr, sorted_list_difference,
__unittest = True __unittest = True
DIFF_OMITTED = ('\nDiff is %s characters long. '
'Set self.maxDiff to None to see it.')
class SkipTest(Exception): class SkipTest(Exception):
""" """
Raise this exception in a test to skip it. Raise this exception in a test to skip it.
...@@ -711,7 +715,7 @@ class TestCase(object): ...@@ -711,7 +715,7 @@ class TestCase(object):
max_diff = self.maxDiff max_diff = self.maxDiff
if max_diff is None or len(diff) <= max_diff: if max_diff is None or len(diff) <= max_diff:
return message + diff return message + diff
return message return message + (DIFF_OMITTED % len(diff))
def assertListEqual(self, list1, list2, msg=None): def assertListEqual(self, list1, list2, msg=None):
"""A list-specific equality assertion. """A list-specific equality assertion.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment