Re: [PATCH] test: Fix UTF-8 JSON tests in Python 3

diff --git a/b2/2807f2dd059f678a62282bcce9b17b527868f2 b/b2/2807f2dd059f678a62282bcce9b17b527868f2
new file mode 100644 (file)
index 0000000..387c576
--- /dev/null
+++ b/b2/2807f2dd059f678a62282bcce9b17b527868f2
@@ -0,0 +1,97 @@
+Return-Path: <tomi.ollila@iki.fi>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 20623431FB6\r
+       for <notmuch@notmuchmail.org>; Thu,  6 Dec 2012 13:15:19 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id 5epmUD7jef4R for <notmuch@notmuchmail.org>;\r
+       Thu,  6 Dec 2012 13:15:18 -0800 (PST)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id 2C43A431FAE\r
+       for <notmuch@notmuchmail.org>; Thu,  6 Dec 2012 13:15:18 -0800 (PST)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id 625ED100045;\r
+       Thu,  6 Dec 2012 23:15:13 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: Austin Clements <amdragon@MIT.EDU>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] test: Fix UTF-8 JSON tests in Python 3\r
+In-Reply-To: <1354634654-9564-1-git-send-email-amdragon@mit.edu>\r
+References: <87d2yp27zu.fsf@nexoid.at>\r
+       <1354634654-9564-1-git-send-email-amdragon@mit.edu>\r
+User-Agent: Notmuch/0.14+116~g29fcdb5 (http://notmuchmail.org) Emacs/24.2.1\r
+       (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+       $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+       !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Thu, 06 Dec 2012 23:15:13 +0200\r
+Message-ID: <m2vcceq3vi.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Thu, 06 Dec 2012 21:15:19 -0000\r
+\r
+On Tue, Dec 04 2012, Austin Clements <amdragon@MIT.EDU> wrote:\r
+\r
+> test_expect_equal_json uses json.tool from the system Python.  While\r
+> Python 2 wasn't picky about the encoding of stdin, Python 3 decodes\r
+> stdin strictly according to the environment.  Since we set LC_ALL=C\r
+> for the tests, Python 3's json.tool was assuming stdin would be in\r
+> ASCII and aborting when it couldn't decode the UTF-8 characters from\r
+> some of the JSON tests.  This patch sets the PYTHONIOENCODING\r
+> environment variable to utf-8 when invoking json.tool to override\r
+> Python's default encoding choice.\r
+> ---\r
+\r
+LGTM.\r
+\r
+Tomi\r
+\r
+>  test/test-lib.sh |    9 +++++++--\r
+>  1 file changed, 7 insertions(+), 2 deletions(-)\r
+>\r
+> diff --git a/test/test-lib.sh b/test/test-lib.sh\r
+> index f169785..9487526 100644\r
+> --- a/test/test-lib.sh\r
+> +++ b/test/test-lib.sh\r
+> @@ -534,8 +534,13 @@ test_expect_equal_file ()\r
+>  # canonicalized before diff'ing.  If an argument cannot be parsed, it\r
+>  # is used unchanged so that there's something to diff against.\r
+>  test_expect_equal_json () {\r
+> -    output=$(echo "$1" | python -mjson.tool || echo "$1")\r
+> -    expected=$(echo "$2" | python -mjson.tool || echo "$2")\r
+> +    # The test suite forces LC_ALL=C, but this causes Python 3 to\r
+> +    # decode stdin as ASCII.  We need to read JSON in UTF-8, so\r
+> +    # override Python's stdio encoding defaults.\r
+> +    output=$(echo "$1" | PYTHONIOENCODING=utf-8 python -mjson.tool \\r
+> +        || echo "$1")\r
+> +    expected=$(echo "$2" | PYTHONIOENCODING=utf-8 python -mjson.tool \\r
+> +        || echo "$2")\r
+>      shift 2\r
+>      test_expect_equal "$output" "$expected" "$@"\r
+>  }\r
+> -- \r
+> 1.7.10.4\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r