diff options
Diffstat (limited to 'community/notmuch/fix-tests-for-python3.patch')
| -rw-r--r-- | community/notmuch/fix-tests-for-python3.patch | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/community/notmuch/fix-tests-for-python3.patch b/community/notmuch/fix-tests-for-python3.patch deleted file mode 100644 index 1b71751db4..0000000000 --- a/community/notmuch/fix-tests-for-python3.patch +++ /dev/null @@ -1,20 +0,0 @@ -Fix test-lib.sh for Python 3.5+. - -Since Python 3.5 json.tool does not sort JSON keys unless --sort-keys -is specified. -See https://docs.python.org/3/library/json.html#module-json.tool. - ---- a/test/test-lib.sh -+++ b/test/test-lib.sh -@@ -627,9 +627,9 @@ - # 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 \ -+ output=$(echo "$1" | PYTHONIOENCODING=utf-8 $NOTMUCH_PYTHON -mjson.tool --sort-keys \ - || echo "$1") -- expected=$(echo "$2" | PYTHONIOENCODING=utf-8 $NOTMUCH_PYTHON -mjson.tool \ -+ expected=$(echo "$2" | PYTHONIOENCODING=utf-8 $NOTMUCH_PYTHON -mjson.tool --sort-keys \ - || echo "$2") - shift 2 - test_expect_equal "$output" "$expected" "$@" |