Mercurial > hg
changeset 21737:8a63e691179a
run-tests: filter whitespace at end of error diffs
Python 2.6 and 2.7 produce slightly different diff headers.
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Fri, 13 Jun 2014 16:36:53 -0500 |
| parents | 07eb76186b41 |
| children | 7ec3b32b98bb |
| files | tests/run-tests.py |
| diffstat | 1 files changed, 3 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/run-tests.py Thu Jun 12 01:28:22 2014 +0530 +++ b/tests/run-tests.py Fri Jun 13 16:36:53 2014 -0500 @@ -286,6 +286,9 @@ servefail = False lines = [] for line in difflib.unified_diff(expected, output, ref, err): + if line.startswith('+++') or line.startswith('---'): + if line.endswith(' \n'): + line = line[:-2] + '\n' lines.append(line) if not servefail and line.startswith( '+ abort: child process failed to start'):