39/45479f2c9d113277493e9b4f5d9b2d3a61ebe7

   1 Return-Path: <markwalters1009@gmail.com>\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 EF9D4429E29\r
   6         for <notmuch@notmuchmail.org>; Mon, 19 Mar 2012 08:31:17 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: 0.201\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=0.201 tagged_above=-999 required=5\r
  12         tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
  13         FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
  14         RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  15 Received: from olra.theworths.org ([127.0.0.1])\r
  16         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  17         with ESMTP id ro0g3uC2683A for <notmuch@notmuchmail.org>;\r
  18         Mon, 19 Mar 2012 08:31:16 -0700 (PDT)\r
  19 Received: from mail-we0-f181.google.com (mail-we0-f181.google.com\r
  20         [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
  21         (No client certificate requested)\r
  22         by olra.theworths.org (Postfix) with ESMTPS id 62BBF429E28\r
  23         for <notmuch@notmuchmail.org>; Mon, 19 Mar 2012 08:31:16 -0700 (PDT)\r
  24 Received: by werm13 with SMTP id m13so6830554wer.26\r
  25         for <notmuch@notmuchmail.org>; Mon, 19 Mar 2012 08:31:15 -0700 (PDT)\r
  26 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
  27         h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;\r
  28         bh=/HdZTDkqeugyknmzwwCGIhYC56AuaO7Pd6CmYKOYA5I=;\r
  29         b=af6IDsvMx99H18rEzkf9btRSfwuzoq6pfGusOvr789Ipkzg4xwzPgOE4XHl/jWx3ef\r
  30         j/oV4GYEh2YeknpnzRlcR9pPJdbNPYF1x0li6T5PvmwW3DQLYOSdBlIA1zpCOPTrDAXm\r
  31         Bb7MMUNWkIdjRxcNYc6nu9WaYanLk6doXRxcTiFyOHWG/63j4u20U3rgh5Y8q+OfESUg\r
  32         ei3OvtOoVSZ3KH/lzmNRYPHm9X/Po6KqxkI+5MC8crREfqiwPVYZZnw2+8kAksAjGFtr\r
  33         1JpI3dqQXPapmeh2AqWfPiyjPplzdhK6zGrWtxwF9O7p7QMQslfb0qCqWUeHbPB2IsM3\r
  34         2yWA==\r
  35 Received: by 10.216.145.209 with SMTP id p59mr7493917wej.50.1332171075113;\r
  36         Mon, 19 Mar 2012 08:31:15 -0700 (PDT)\r
  37 Received: from localhost (94-192-233-223.zone6.bethere.co.uk.\r
  38  [94.192.233.223])      by mx.google.com with ESMTPS id\r
  39  b3sm26353557wib.4.2012.03.19.08.31.13  (version=TLSv1/SSLv3 cipher=OTHER);\r
  40         Mon, 19 Mar 2012 08:31:14 -0700 (PDT)\r
  41 From: Mark Walters <markwalters1009@gmail.com>\r
  42 To: notmuch@notmuchmail.org\r
  43 Subject: [PATCH 2/2] test: show tests\r
  44 Date: Mon, 19 Mar 2012 15:31:01 +0000\r
  45 Message-Id: <1332171061-27983-3-git-send-email-markwalters1009@gmail.com>\r
  46 X-Mailer: git-send-email 1.7.9.1\r
  47 In-Reply-To: <1332171061-27983-1-git-send-email-markwalters1009@gmail.com>\r
  48 References: <1332171061-27983-1-git-send-email-markwalters1009@gmail.com>\r
  49 X-BeenThere: notmuch@notmuchmail.org\r
  50 X-Mailman-Version: 2.1.13\r
  51 Precedence: list\r
  52 List-Id: "Use and development of the notmuch mail system."\r
  53         <notmuch.notmuchmail.org>\r
  54 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  55         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  56 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  57 List-Post: <mailto:notmuch@notmuchmail.org>\r
  58 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  59 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  60         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  61 X-List-Received-Date: Mon, 19 Mar 2012 15:31:18 -0000\r
  62 \r
  63 ---\r
  64  test/notmuch-test |    1 +\r
  65  test/show         |   47 +++++++++++++++++++++++++++++++++++++++++++++++\r
  66  2 files changed, 48 insertions(+), 0 deletions(-)\r
  67  create mode 100755 test/show\r
  68 \r
  69 diff --git a/test/notmuch-test b/test/notmuch-test\r
  70 index f03b594..2499e4b 100755\r
  71 --- a/test/notmuch-test\r
  72 +++ b/test/notmuch-test\r
  73 @@ -28,6 +28,7 @@ TESTS="\r
  74    search-insufficient-from-quoting\r
  75    search-limiting\r
  76    tagging\r
  77 +  show\r
  78    json\r
  79    multipart\r
  80    thread-naming\r
  81 diff --git a/test/show b/test/show\r
  82 new file mode 100755\r
  83 index 0000000..fc83e5e\r
  84 --- /dev/null\r
  85 +++ b/test/show\r
  86 @@ -0,0 +1,47 @@\r
  87 +#!/usr/bin/env bash\r
  88 +test_description='"notmuch show" in several variations'\r
  89 +. ./test-lib.sh\r
  90 +\r
  91 +EXPECTED=$TEST_DIRECTORY/show.expected-output\r
  92 +\r
  93 +add_email_corpus\r
  94 +\r
  95 +thread_query=`notmuch search --output=threads subject:"Working with Maildir storage?"`\r
  96 +\r
  97 +test_begin_subtest "Show single thread (text)"\r
  98 +notmuch show $thread_query >OUTPUT\r
  99 +test_expect_equal_file OUTPUT $EXPECTED/single-thread-text\r
 100 +\r
 101 +test_begin_subtest "Show single thread (json)"\r
 102 +notmuch show --format=json $thread_query | notmuch_json_show_sanitize >OUTPUT\r
 103 +test_expect_equal_file OUTPUT $EXPECTED/single-thread-json\r
 104 +\r
 105 +test_begin_subtest "Show single thread (mbox)"\r
 106 +notmuch show --format=mbox $thread_query >OUTPUT\r
 107 +test_expect_equal_file OUTPUT $EXPECTED/single-thread-mbox\r
 108 +\r
 109 +test_begin_subtest "Show single thread with additional query (text)"\r
 110 +notmuch show $thread_query and from:worth >OUTPUT\r
 111 +test_expect_equal_file OUTPUT $EXPECTED/single-thread-and-query-text\r
 112 +\r
 113 +test_begin_subtest "Show single thread with additional query --entire-thread (text)"\r
 114 +notmuch show --entire-thread $thread_query and from:worth >OUTPUT\r
 115 +test_expect_equal_file OUTPUT $EXPECTED/single-thread-and-query-entire-thread-text\r
 116 +\r
 117 +test_begin_subtest "Show single thread with additional query (json)"\r
 118 +notmuch show --format=json $thread_query and from:worth | notmuch_json_show_sanitize >OUTPUT\r
 119 +test_expect_equal_file OUTPUT $EXPECTED/single-thread-and-query-json\r
 120 +\r
 121 +test_begin_subtest "Show single thread with additional query --entire-thread (json)"\r
 122 +notmuch show --format=json --entire-thread $thread_query and from:worth | notmuch_json_show_sanitize >OUTPUT\r
 123 +test_expect_equal_file OUTPUT $EXPECTED/single-thread-and-query-entire-thread-json\r
 124 +\r
 125 +test_begin_subtest "Show single thread with additional query (mbox)"\r
 126 +notmuch show --format=mbox $thread_query and from:worth >OUTPUT\r
 127 +test_expect_equal_file OUTPUT $EXPECTED/single-thread-and-query-mbox\r
 128 +\r
 129 +test_begin_subtest "Show single thread with additional query --entire-thread (mbox)"\r
 130 +notmuch show --format=mbox --entire-thread $thread_query and from:worth >OUTPUT\r
 131 +test_expect_equal_file OUTPUT $EXPECTED/single-thread-and-query-entire-thread-mbox\r
 132 +\r
 133 +test_done\r
 134 -- \r
 135 1.7.9.1\r
 136 \r