Mercurial > public > mercurial-scm > hg
diff tests/run-tests.py @ 29199:daff05dcd184
run-tests: handle json.dumps divergence
In py2, json.dumps includes a trailing space after a comma at the
end of lines. The py3 behavior which omits the trailing space is
preferable, so we're going to strip it.
| author | timeless <timeless@mozdev.org> |
|---|---|
| date | Thu, 05 May 2016 23:17:19 +0000 |
| parents | c969c72d6cbc |
| children | 8dbfd3befbd7 |
line wrap: on
line diff
--- a/tests/run-tests.py Tue May 10 22:52:26 2016 +0000 +++ b/tests/run-tests.py Thu May 05 23:17:19 2016 +0000 @@ -1836,7 +1836,8 @@ tres = {'result': res} outcome[tc.name] = tres - jsonout = json.dumps(outcome, sort_keys=True, indent=4) + out = json.dumps(outcome, sort_keys=True, indent=4) + jsonout = '\n'.join([l.rstrip() for l in out.splitlines()]) fp.writelines(("testreport =", jsonout)) self._runner._checkhglib('Tested')