floraachy/pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Truncate the text passed to difflib where possible

Browse Source 
This stops difflib from printing many lines which had no change in
them anyway.  It also avoids a bug in difflib which fails or hangs
when there are many trailing lines which are all identical.

--HG--
branch : trunk
This commit is contained in:
Floris Bruynooghe
2010-09-30 23:15:41 +01:00
parent c3166ee84a
commit cd5676adc4
2 changed files with 56 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
py/_plugin/pytest_assertion.py
View File

@@ -54,18 +54,16 @@ def pytest_assert_binrepr(op, left, right):
explanation = None
if op == '==':
if istext(left) and istext(right):
explanation = [line.strip('\n') for line in
py.std.difflib.ndiff(left.splitlines(),
right.splitlines())]
explanation = _diff_text(left, right)
elif issequence(left) and issequence(right):
explanation = _compare_eq_sequence(left, right)
elif isset(left) and isset(right):
explanation = _compare_eq_set(left, right)
elif isdict(left) and isdict(right):
explanation = _pprint_diff(left, right)
explanation = _diff_text(py.std.pprint.pformat(left),
py.std.pprint.pformat(right))
elif op == 'in':
# XXX
pass
pass # XXX
if not explanation:
return None
@@ -77,6 +75,38 @@ def pytest_assert_binrepr(op, left, right):
return [summary] + explanation
def _diff_text(left, right):
"""Return the explanation for the diff between text
This will skip leading and trailing characters which are
identical to keep the diff minimal.
"""
explanation = []
for i in range(min(len(left), len(right))):
if left[i] != right[i]:
break
if i > 42:
i -= 10 # Provide some context
explanation = ['Skipping %s identical '
'leading characters in diff' % i]
left = left[i:]
right = right[i:]
if len(left) == len(right):
for i in range(len(left)):
if left[-i] != right[-i]:
break
if i > 42:
i -= 10 # Provide some context
explanation += ['Skipping %s identical '
'trailing characters in diff' % i]
left = left[:-i]
right = right[:-i]
explanation += [line.strip('\n')
for line in py.std.difflib.ndiff(left.splitlines(),
right.splitlines())]
return explanation
def _compare_eq_sequence(left, right):
explanation = []
for i in range(min(len(left), len(right))):
@@ -90,14 +120,8 @@ def _compare_eq_sequence(left, right):
elif len(left) < len(right):
explanation += ['Right contains more items, '
'first extra item: %s' % right[len(left)]]
return explanation + _pprint_diff(left, right)
def _pprint_diff(left, right):
"""Make explanation using pprint and difflib"""
return [line.strip('\n') for line in
py.std.difflib.ndiff(py.std.pprint.pformat(left).splitlines(),
py.std.pprint.pformat(right).splitlines())]
return explanation + _diff_text(py.std.pprint.pformat(left),
py.std.pprint.pformat(right))
def _compare_eq_set(left, right):