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

diff --git a/d2/166b12448719f6dda4e90e3a62c3c4d831f2a7 b/d2/166b12448719f6dda4e90e3a62c3c4d831f2a7
new file mode 100644 (file)
index 0000000..c61fd48
--- /dev/null
+++ b/d2/166b12448719f6dda4e90e3a62c3c4d831f2a7
@@ -0,0 +1,97 @@
+Return-Path: <bremner@tesseract.cs.unb.ca>\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 16F56431FCB\r
+       for <notmuch@notmuchmail.org>; Sun,  8 Dec 2013 07:53:23 -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 7W4aTCtzzkSH for <notmuch@notmuchmail.org>;\r
+       Sun,  8 Dec 2013 07:53:16 -0800 (PST)\r
+Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])\r
+       (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 2A033429E31\r
+       for <notmuch@notmuchmail.org>; Sun,  8 Dec 2013 07:53:10 -0800 (PST)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+       (envelope-from <bremner@tesseract.cs.unb.ca>)\r
+       id 1VpgfN-0006Am-Oe; Sun, 08 Dec 2013 11:53:09 -0400\r
+Received: (nullmailer pid 22778 invoked by uid 1000); Sun, 08 Dec 2013\r
+       15:52:31 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/4] test: pass expected output through json_sanitize in 2\r
+       places\r
+Date: Sun,  8 Dec 2013 23:52:23 +0800\r
+Message-Id: <1386517946-22054-2-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.8.4.3\r
+In-Reply-To: <1386517946-22054-1-git-send-email-david@tethera.net>\r
+References: <1386517946-22054-1-git-send-email-david@tethera.net>\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 15:53:23 -0000\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
+ {"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