Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
run-tests: filter whitespace at end of error diffs
authorMatt Mackall <mpm@selenic.com>
Fri, 13 Jun 2014 16:36:53 -0500
changeset 21737 8a63e691179a
parent 21736 07eb76186b41
child 21738 7ec3b32b98bb
run-tests: filter whitespace at end of error diffs Python 2.6 and 2.7 produce slightly different diff headers.
tests/run-tests.py file | annotate | diff | comparison | revisions 
--- 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'):
mercurial