debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-12-23 09:54:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

test: Fix UTF-8 JSON tests in Python 3

Browse source 
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.
This commit is contained in:
Austin Clements 2012-12-04 10:24:14 -05:00 committed by David Bremner
parent 2bd922ff06
commit 21326a1e6b
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
test/test-lib.sh
View file

@ -534,8 +534,13 @@ test_expect_equal_file ()
# canonicalized before diff'ing. If an argument cannot be parsed, it # canonicalized before diff'ing. If an argument cannot be parsed, it
# is used unchanged so that there's something to diff against. # is used unchanged so that there's something to diff against.
test_expect_equal_json () { test_expect_equal_json () {
output=$(echo "$1" | python -mjson.tool || echo "$1") # The test suite forces LC_ALL=C, but this causes Python 3 to
expected=$(echo "$2" | python -mjson.tool || echo "$2") # 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 shift 2
test_expect_equal "$output" "$expected" "$@" test_expect_equal "$output" "$expected" "$@"
} }