[PATCH 4 of 4 v2] run-tests: handle json.dumps divergence
timeless
timeless at fmr.im
Wed May 11 13:51:27 EDT 2016
# HG changeset patch
# User timeless <timeless at mozdev.org>
# Date 1462490239 0
# Thu May 05 23:17:19 2016 +0000
# Node ID 3fb8b57b459449a97de29b3828fe75baada38eac
# Parent ac615a1325bf2d0a2d8c87ae32e755c5d6f56e52
# EXP-Topic runtests
# Available At bb://timeless/mercurial-crew
# hg pull bb://timeless/mercurial-crew -r 3fb8b57b4594
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.
diff -r ac615a1325bf -r 3fb8b57b4594 tests/run-tests.py
--- a/tests/run-tests.py Tue Apr 05 01:35:58 2016 +0000
+++ b/tests/run-tests.py Thu May 05 23:17:19 2016 +0000
@@ -1843,7 +1843,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')
diff -r ac615a1325bf -r 3fb8b57b4594 tests/test-run-tests.t
--- a/tests/test-run-tests.t Tue Apr 05 01:35:58 2016 +0000
+++ b/tests/test-run-tests.t Thu May 05 23:17:19 2016 +0000
@@ -586,7 +586,7 @@
testreport ={
"test-bogus.t": {
"result": "skip"
- },
+ },
"test-failure.t": {
"result": "skip"
}
More information about the Mercurial-devel
mailing list