p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #978 from nicoddemus/string-diff 

Show a few diff lines when truncating string diffs
This commit is contained in:
Floris Bruynooghe 2015-08-28 09:04:39 +01:00
parent 9f30ae9850 dd7112d5ea
commit 553aef57aa
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG
View File

@ -1,9 +1,13 @@
2.8.0.dev (compared to 2.7.X) 2.8.0.dev (compared to 2.7.X)
----------------------------- -----------------------------
- Fix #562: @nose.tools.istest now fully respected. - fix issue562: @nose.tools.istest now fully respected.
- Fix issue736: Fix a bug where fixture params would be discarded when combined - fix issue934: when string comparison fails and a diff is too large to display
without passing -vv, still show a few lines of the diff.
Thanks Florian Bruhin for the report and Bruno Oliveira for the PR.
- fix issue736: Fix a bug where fixture params would be discarded when combined
with parametrization markers. with parametrization markers.
Thanks to Markus Unterwaditzer for the PR. Thanks to Markus Unterwaditzer for the PR.

7
_pytest/assertion/__init__.py
View File

@ -114,8 +114,11 @@ def pytest_runtest_setup(item):
if new_expl: if new_expl:
if (sum(len(p) for p in new_expl[1:]) > 80*8 if (sum(len(p) for p in new_expl[1:]) > 80*8
and item.config.option.verbose < 2): and item.config.option.verbose < 2):
new_expl[1:] = [py.builtin._totext( show_max = 10
'Detailed information truncated, use "-vv" to show')] truncated_lines = len(new_expl) - show_max
new_expl[show_max:] = [py.builtin._totext(
'Detailed information truncated (%d more lines)'
', use "-vv" to show' % truncated_lines)]
new_expl = [line.replace("\n", "\\n") for line in new_expl] new_expl = [line.replace("\n", "\\n") for line in new_expl]
res = py.builtin._totext("\n~").join(new_expl) res = py.builtin._totext("\n~").join(new_expl)
if item.config.getvalue("assertmode") == "rewrite": if item.config.getvalue("assertmode") == "rewrite":

7
testing/test_assertion.py
View File

@ -411,8 +411,13 @@ def test_assert_compare_truncate_longmessage(testdir):
""") """)
result = testdir.runpytest() result = testdir.runpytest()
# without -vv, truncate the message showing a few diff lines only
result.stdout.fnmatch_lines([ result.stdout.fnmatch_lines([
"*truncated*use*-vv*", "*- 1",
"*- 3",
"*- 5",
"*- 7",
"*truncated (191 more lines)*use*-vv*",
]) ])