b2/597f647d2486d1955fdd9884205e30df9d08ff

   1 Return-Path: <tomi.ollila@iki.fi>\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 1AE91431E62\r
   6         for <notmuch@notmuchmail.org>; Sun,  8 Dec 2013 10:54:55 -0800 (PST)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: 0\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
  12         autolearn=disabled\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 hQZJzRGytZBZ for <notmuch@notmuchmail.org>;\r
  16         Sun,  8 Dec 2013 10:54:47 -0800 (PST)\r
  17 Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
  18         by olra.theworths.org (Postfix) with ESMTP id 47BC6431FD4\r
  19         for <notmuch@notmuchmail.org>; Sun,  8 Dec 2013 10:54:47 -0800 (PST)\r
  20 Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
  21         by guru.guru-group.fi (Postfix) with ESMTP id 47F8A10005D;\r
  22         Sun,  8 Dec 2013 20:54:41 +0200 (EET)\r
  23 From: Tomi Ollila <tomi.ollila@iki.fi>\r
  24 To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org\r
  25 Subject: Re: [PATCH 1/4] test: pass expected output through json_sanitize in 2\r
  26         places\r
  27 In-Reply-To: <1386517946-22054-2-git-send-email-david@tethera.net>\r
  28 References: <1386517946-22054-1-git-send-email-david@tethera.net>\r
  29         <1386517946-22054-2-git-send-email-david@tethera.net>\r
  30 User-Agent: Notmuch/0.17~rc1+17~ga2e1a2f (http://notmuchmail.org) Emacs/24.3.1\r
  31         (x86_64-unknown-linux-gnu)\r
  32 X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
  33         $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
  34         !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
  35 Date: Sun, 08 Dec 2013 20:54:41 +0200\r
  36 Message-ID: <m2eh5nnpfy.fsf@guru.guru-group.fi>\r
  37 MIME-Version: 1.0\r
  38 Content-Type: text/plain\r
  39 X-BeenThere: notmuch@notmuchmail.org\r
  40 X-Mailman-Version: 2.1.13\r
  41 Precedence: list\r
  42 List-Id: "Use and development of the notmuch mail system."\r
  43         <notmuch.notmuchmail.org>\r
  44 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  45         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  46 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  47 List-Post: <mailto:notmuch@notmuchmail.org>\r
  48 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  49 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  50         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  51 X-List-Received-Date: Sun, 08 Dec 2013 18:54:55 -0000\r
  52 \r
  53 On Sun, Dec 08 2013, David Bremner <david@tethera.net> wrote:\r
  54 \r
  55 > This makes the tests more robust against changes in the\r
  56 > sanitization rules.\r
  57 > ---\r
  58 >  test/missing-headers | 8 +++++---\r
  59 >  test/multipart       | 2 +-\r
  60 >  2 files changed, 6 insertions(+), 4 deletions(-)\r
  61 >\r
  62 > diff --git a/test/missing-headers b/test/missing-headers\r
  63 > index 43e861b..cb38301 100755\r
  64 > --- a/test/missing-headers\r
  65 > +++ b/test/missing-headers\r
  66 > @@ -95,7 +95,7 @@ Body\r
  67 >  \r
  68 >  test_begin_subtest "Show: json"\r
  69 >  output=$(notmuch show --format=json '*' | notmuch_json_show_sanitize)\r
  70 > -test_expect_equal_json "$output" '\r
  71 > +expected=$(notmuch_json_show_sanitize <<EOF\r
  72 >  [\r
  73 >      [\r
  74 >          [\r
  75 > @@ -156,7 +156,9 @@ test_expect_equal_json "$output" '\r
  76 >              []\r
  77 >          ]\r
  78 >      ]\r
  79 > -]'\r
  80 > -\r
  81 > +]\r
  82 > +EOF\r
  83 > +)\r
  84 > +test_expect_equal_json "$output" "$expected"\r
  85 >  \r
  86 >  test_done\r
  87 > diff --git a/test/multipart b/test/multipart\r
  88 > index b40fa2c..73f8fdd 100755\r
  89 > --- a/test/multipart\r
  90 > +++ b/test/multipart\r
  91 > @@ -594,7 +594,7 @@ test_expect_equal_file OUTPUT EXPECTED\r
  92 >  \r
  93 >  test_begin_subtest "'notmuch reply' to a multipart message with json format"\r
  94 >  notmuch reply --format=json 'id:87liy5ap00.fsf@yoom.home.cworth.org' | notmuch_json_show_sanitize >OUTPUT\r
  95 > -cat <<EOF >EXPECTED\r
  96 > +cat <<EOF | notmuch_json_show_sanitize >EXPECTED\r
  97 \r
  98 notmuch_json_show_sanitize <<EOF >EXPECTED\r
  99 \r
 100 would do it.\r
 101 \r
 102 >  {"reply-headers": {"Subject": "Re: Multipart message",\r
 103 >   "From": "Notmuch Test Suite <test_suite@notmuchmail.org>",\r
 104 >   "To": "Carl Worth <cworth@cworth.org>, cworth@cworth.org",\r
 105 > -- \r
 106 > 1.8.4.3\r
 107 >\r
 108 > _______________________________________________\r
 109 > notmuch mailing list\r
 110 > notmuch@notmuchmail.org\r
 111 > http://notmuchmail.org/mailman/listinfo/notmuch\r