* [PATCH] test: Use small Python script for JSON normalization instead of json.tool
@ 2017-08-16 16:31 Vladimir Panteleev
2017-08-23 11:11 ` David Bremner
0 siblings, 1 reply; 2+ messages in thread
From: Vladimir Panteleev @ 2017-08-16 16:31 UTC (permalink / raw)
To: notmuch
json.tool does not sort or otherwise normalize the order of JSON keys
in its output, which can result in test failures on some test systems.
Instead, use a one-line Python script passed to the interpreter
directly on its command line. Use sort_keys=True for json.dump to
ensure the key order is normalized. The script works with both Python
2 and 3.
* test/test-lib.sh: Update test_expect_equal_json.
---
test/test-lib.sh | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/test/test-lib.sh b/test/test-lib.sh
index 7ae96c69..d720bb69 100644
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -627,9 +627,10 @@ test_expect_equal_json () {
# The test suite forces LC_ALL=C, but this causes Python 3 to
# decode stdin as ASCII. We need to read JSON in UTF-8, so
# override Python's stdio encoding defaults.
- output=$(echo "$1" | PYTHONIOENCODING=utf-8 $NOTMUCH_PYTHON -mjson.tool \
+ local script='import json, sys; json.dump(json.load(sys.stdin), sys.stdout, sort_keys=True, indent=4)'
+ output=$(echo "$1" | PYTHONIOENCODING=utf-8 $NOTMUCH_PYTHON -c "$script" \
|| echo "$1")
- expected=$(echo "$2" | PYTHONIOENCODING=utf-8 $NOTMUCH_PYTHON -mjson.tool \
+ expected=$(echo "$2" | PYTHONIOENCODING=utf-8 $NOTMUCH_PYTHON -c "$script" \
|| echo "$2")
shift 2
test_expect_equal "$output" "$expected" "$@"
--
2.13.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] test: Use small Python script for JSON normalization instead of json.tool
2017-08-16 16:31 [PATCH] test: Use small Python script for JSON normalization instead of json.tool Vladimir Panteleev
@ 2017-08-23 11:11 ` David Bremner
0 siblings, 0 replies; 2+ messages in thread
From: David Bremner @ 2017-08-23 11:11 UTC (permalink / raw)
To: Vladimir Panteleev, notmuch
Vladimir Panteleev <notmuch@thecybershadow.net> writes:
> json.tool does not sort or otherwise normalize the order of JSON keys
> in its output, which can result in test failures on some test systems.
>
pushed to master
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-08-23 11:11 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-08-16 16:31 [PATCH] test: Use small Python script for JSON normalization instead of json.tool Vladimir Panteleev
2017-08-23 11:11 ` David Bremner
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).