Re: [PATCH 1/4] test: pass expected output through json_sanitize in 2 places

diff --git a/b2/597f647d2486d1955fdd9884205e30df9d08ff b/b2/597f647d2486d1955fdd9884205e30df9d08ff
new file mode 100644 (file)
index 0000000..3822ac6
--- /dev/null
+++ b/b2/597f647d2486d1955fdd9884205e30df9d08ff
@@ -0,0 +1,111 @@
+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 1AE91431E62\r
+       for <notmuch@notmuchmail.org>; Sun,  8 Dec 2013 10:54:55 -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 hQZJzRGytZBZ for <notmuch@notmuchmail.org>;\r
+       Sun,  8 Dec 2013 10:54:47 -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 47BC6431FD4\r
+       for <notmuch@notmuchmail.org>; Sun,  8 Dec 2013 10:54:47 -0800 (PST)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id 47F8A10005D;\r
+       Sun,  8 Dec 2013 20:54:41 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 1/4] test: pass expected output through json_sanitize in 2\r
+       places\r
+In-Reply-To: <1386517946-22054-2-git-send-email-david@tethera.net>\r
+References: <1386517946-22054-1-git-send-email-david@tethera.net>\r
+       <1386517946-22054-2-git-send-email-david@tethera.net>\r
+User-Agent: Notmuch/0.17~rc1+17~ga2e1a2f (http://notmuchmail.org) Emacs/24.3.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: Sun, 08 Dec 2013 20:54:41 +0200\r
+Message-ID: <m2eh5nnpfy.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: Sun, 08 Dec 2013 18:54:55 -0000\r
+\r
+On Sun, Dec 08 2013, David Bremner <david@tethera.net> wrote:\r
+\r
+> This makes the tests more robust against changes in the\r
+> sanitization rules.\r
+> ---\r
+>  test/missing-headers | 8 +++++---\r
+>  test/multipart       | 2 +-\r
+>  2 files changed, 6 insertions(+), 4 deletions(-)\r
+>\r
+> diff --git a/test/missing-headers b/test/missing-headers\r
+> index 43e861b..cb38301 100755\r
+> --- a/test/missing-headers\r
+> +++ b/test/missing-headers\r
+> @@ -95,7 +95,7 @@ Body\r
+>  \r
+>  test_begin_subtest "Show: json"\r
+>  output=$(notmuch show --format=json '*' | notmuch_json_show_sanitize)\r
+> -test_expect_equal_json "$output" '\r
+> +expected=$(notmuch_json_show_sanitize <<EOF\r
+>  [\r
+>      [\r
+>          [\r
+> @@ -156,7 +156,9 @@ test_expect_equal_json "$output" '\r
+>              []\r
+>          ]\r
+>      ]\r
+> -]'\r
+> -\r
+> +]\r
+> +EOF\r
+> +)\r
+> +test_expect_equal_json "$output" "$expected"\r
+>  \r
+>  test_done\r
+> diff --git a/test/multipart b/test/multipart\r
+> index b40fa2c..73f8fdd 100755\r
+> --- a/test/multipart\r
+> +++ b/test/multipart\r
+> @@ -594,7 +594,7 @@ test_expect_equal_file OUTPUT EXPECTED\r
+>  \r
+>  test_begin_subtest "'notmuch reply' to a multipart message with json format"\r
+>  notmuch reply --format=json 'id:87liy5ap00.fsf@yoom.home.cworth.org' | notmuch_json_show_sanitize >OUTPUT\r
+> -cat <<EOF >EXPECTED\r
+> +cat <<EOF | notmuch_json_show_sanitize >EXPECTED\r
+\r
+notmuch_json_show_sanitize <<EOF >EXPECTED\r
+\r
+would do it.\r
+\r
+>  {"reply-headers": {"Subject": "Re: Multipart message",\r
+>   "From": "Notmuch Test Suite <test_suite@notmuchmail.org>",\r
+>   "To": "Carl Worth <cworth@cworth.org>, cworth@cworth.org",\r
+> -- \r
+> 1.8.4.3\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r