diff options
author | Austin Clements <amdragon@MIT.EDU> | 2012-12-04 10:24:14 -0500 |
---|---|---|
committer | David Bremner <bremner@debian.org> | 2012-12-08 09:19:34 -0400 |
commit | 21326a1e6b23f0dc98d13c93cd5023e148fd1a5d (patch) | |
tree | c8b5edb2219bcb0352e4c1c947dff991a5aa7e72 /test | |
parent | 2bd922ff06a4e989dc05a1a6739f649c85dae92e (diff) |
test: Fix UTF-8 JSON tests in Python 3
test_expect_equal_json uses json.tool from the system Python. While
Python 2 wasn't picky about the encoding of stdin, Python 3 decodes
stdin strictly according to the environment. Since we set LC_ALL=C
for the tests, Python 3's json.tool was assuming stdin would be in
ASCII and aborting when it couldn't decode the UTF-8 characters from
some of the JSON tests. This patch sets the PYTHONIOENCODING
environment variable to utf-8 when invoking json.tool to override
Python's default encoding choice.
Diffstat (limited to 'test')
-rw-r--r-- | test/test-lib.sh | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/test/test-lib.sh b/test/test-lib.sh index f1697856..94875261 100644 --- a/test/test-lib.sh +++ b/test/test-lib.sh @@ -534,8 +534,13 @@ test_expect_equal_file () # canonicalized before diff'ing. If an argument cannot be parsed, it # is used unchanged so that there's something to diff against. test_expect_equal_json () { - output=$(echo "$1" | python -mjson.tool || echo "$1") - expected=$(echo "$2" | python -mjson.tool || echo "$2") + # 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 python -mjson.tool \ + || echo "$1") + expected=$(echo "$2" | PYTHONIOENCODING=utf-8 python -mjson.tool \ + || echo "$2") shift 2 test_expect_equal "$output" "$expected" "$@" } |