From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <bremner@tesseract.cs.unb.ca>
Received: from localhost (localhost [127.0.0.1])
	by olra.theworths.org (Postfix) with ESMTP id 431B2431FC0
	for <notmuch@notmuchmail.org>; Mon,  9 Dec 2013 05:37:37 -0800 (PST)
X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
X-Spam-Flag: NO
X-Spam-Score: 0
X-Spam-Level: 
X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
	autolearn=disabled
Received: from olra.theworths.org ([127.0.0.1])
	by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id 2QyjJgjU5B+1 for <notmuch@notmuchmail.org>;
	Mon,  9 Dec 2013 05:37:33 -0800 (PST)
Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])
	(using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))
	(No client certificate requested)
	by olra.theworths.org (Postfix) with ESMTPS id F0719431FBC
	for <notmuch@notmuchmail.org>; Mon,  9 Dec 2013 05:37:32 -0800 (PST)
Received: from remotemail by yantan.tethera.net with local (Exim 4.80)
	(envelope-from <bremner@tesseract.cs.unb.ca>)
	id 1Vq11d-0003F5-U7; Mon, 09 Dec 2013 09:37:29 -0400
Received: (nullmailer pid 27757 invoked by uid 1000); Mon, 09 Dec 2013
	13:37:22 -0000
From: David Bremner <david@tethera.net>
To: notmuch@notmuchmail.org
Subject: [Patch v2 1/4] test: pass expected output through json_sanitize in 2
 places
Date: Mon,  9 Dec 2013 21:36:28 +0800
Message-Id: <1386596191-27683-1-git-send-email-david@tethera.net>
X-Mailer: git-send-email 1.8.4.3
In-Reply-To: <1386517946-22054-1-git-send-email-david@tethera.net>
References: <1386517946-22054-1-git-send-email-david@tethera.net>
X-BeenThere: notmuch@notmuchmail.org
X-Mailman-Version: 2.1.13
Precedence: list
List-Id: "Use and development of the notmuch mail system."
	<notmuch.notmuchmail.org>
List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
List-Archive: <http://notmuchmail.org/pipermail/notmuch>
List-Post: <mailto:notmuch@notmuchmail.org>
List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Dec 2013 13:37:37 -0000

This makes the tests more robust against changes in the
sanitization rules.
---
 test/missing-headers | 8 +++++---
 test/multipart       | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/test/missing-headers b/test/missing-headers
index 43e861b..cb38301 100755
--- a/test/missing-headers
+++ b/test/missing-headers
@@ -95,7 +95,7 @@ Body
 
 test_begin_subtest "Show: json"
 output=$(notmuch show --format=json '*' | notmuch_json_show_sanitize)
-test_expect_equal_json "$output" '
+expected=$(notmuch_json_show_sanitize <<EOF
 [
     [
         [
@@ -156,7 +156,9 @@ test_expect_equal_json "$output" '
             []
         ]
     ]
-]'
-
+]
+EOF
+)
+test_expect_equal_json "$output" "$expected"
 
 test_done
diff --git a/test/multipart b/test/multipart
index b40fa2c..85cbf67 100755
--- a/test/multipart
+++ b/test/multipart
@@ -594,7 +594,7 @@ test_expect_equal_file OUTPUT EXPECTED
 
 test_begin_subtest "'notmuch reply' to a multipart message with json format"
 notmuch reply --format=json 'id:87liy5ap00.fsf@yoom.home.cworth.org' | notmuch_json_show_sanitize >OUTPUT
-cat <<EOF >EXPECTED
+notmuch_json_show_sanitize <<EOF >EXPECTED
 {"reply-headers": {"Subject": "Re: Multipart message",
  "From": "Notmuch Test Suite <test_suite@notmuchmail.org>",
  "To": "Carl Worth <cworth@cworth.org>, cworth@cworth.org",
-- 
1.8.4.3