1 Return-Path: <bremner@tesseract.cs.unb.ca>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 16F56431FCB
\r
6 for <notmuch@notmuchmail.org>; Sun, 8 Dec 2013 07:53:23 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id 7W4aTCtzzkSH for <notmuch@notmuchmail.org>;
\r
16 Sun, 8 Dec 2013 07:53:16 -0800 (PST)
\r
17 Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])
\r
18 (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id 2A033429E31
\r
21 for <notmuch@notmuchmail.org>; Sun, 8 Dec 2013 07:53:10 -0800 (PST)
\r
22 Received: from remotemail by yantan.tethera.net with local (Exim 4.80)
\r
23 (envelope-from <bremner@tesseract.cs.unb.ca>)
\r
24 id 1VpgfN-0006Am-Oe; Sun, 08 Dec 2013 11:53:09 -0400
\r
25 Received: (nullmailer pid 22778 invoked by uid 1000); Sun, 08 Dec 2013
\r
27 From: David Bremner <david@tethera.net>
\r
28 To: notmuch@notmuchmail.org
\r
29 Subject: [PATCH 1/4] test: pass expected output through json_sanitize in 2
\r
31 Date: Sun, 8 Dec 2013 23:52:23 +0800
\r
32 Message-Id: <1386517946-22054-2-git-send-email-david@tethera.net>
\r
33 X-Mailer: git-send-email 1.8.4.3
\r
34 In-Reply-To: <1386517946-22054-1-git-send-email-david@tethera.net>
\r
35 References: <1386517946-22054-1-git-send-email-david@tethera.net>
\r
36 X-BeenThere: notmuch@notmuchmail.org
\r
37 X-Mailman-Version: 2.1.13
\r
39 List-Id: "Use and development of the notmuch mail system."
\r
40 <notmuch.notmuchmail.org>
\r
41 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
42 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
43 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
44 List-Post: <mailto:notmuch@notmuchmail.org>
\r
45 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
46 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
47 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
48 X-List-Received-Date: Sun, 08 Dec 2013 15:53:23 -0000
\r
50 This makes the tests more robust against changes in the
\r
53 test/missing-headers | 8 +++++---
\r
54 test/multipart | 2 +-
\r
55 2 files changed, 6 insertions(+), 4 deletions(-)
\r
57 diff --git a/test/missing-headers b/test/missing-headers
\r
58 index 43e861b..cb38301 100755
\r
59 --- a/test/missing-headers
\r
60 +++ b/test/missing-headers
\r
61 @@ -95,7 +95,7 @@ Body
\r
63 test_begin_subtest "Show: json"
\r
64 output=$(notmuch show --format=json '*' | notmuch_json_show_sanitize)
\r
65 -test_expect_equal_json "$output" '
\r
66 +expected=$(notmuch_json_show_sanitize <<EOF
\r
70 @@ -156,7 +156,9 @@ test_expect_equal_json "$output" '
\r
79 +test_expect_equal_json "$output" "$expected"
\r
82 diff --git a/test/multipart b/test/multipart
\r
83 index b40fa2c..73f8fdd 100755
\r
84 --- a/test/multipart
\r
85 +++ b/test/multipart
\r
86 @@ -594,7 +594,7 @@ test_expect_equal_file OUTPUT EXPECTED
\r
88 test_begin_subtest "'notmuch reply' to a multipart message with json format"
\r
89 notmuch reply --format=json 'id:87liy5ap00.fsf@yoom.home.cworth.org' | notmuch_json_show_sanitize >OUTPUT
\r
90 -cat <<EOF >EXPECTED
\r
91 +cat <<EOF | notmuch_json_show_sanitize >EXPECTED
\r
92 {"reply-headers": {"Subject": "Re: Multipart message",
\r
93 "From": "Notmuch Test Suite <test_suite@notmuchmail.org>",
\r
94 "To": "Carl Worth <cworth@cworth.org>, cworth@cworth.org",
\r