[PATCH 3/3] test: add test for showing Reply-To headers

diff --git a/3c/53b4ad5dad1a409b9d59aa5dae935358713324 b/3c/53b4ad5dad1a409b9d59aa5dae935358713324
new file mode 100644 (file)
index 0000000..2e1d48d
--- /dev/null
+++ b/3c/53b4ad5dad1a409b9d59aa5dae935358713324
@@ -0,0 +1,112 @@
+Return-Path: <novalazy@gmail.com>\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 AB470431FC2\r
+       for <notmuch@notmuchmail.org>; Sat, 23 Jun 2012 20:28:26 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.799\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] 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 0OA9pHpLmsKV for <notmuch@notmuchmail.org>;\r
+       Sat, 23 Jun 2012 20:28:25 -0700 (PDT)\r
+Received: from mail-pb0-f53.google.com (mail-pb0-f53.google.com\r
+       [209.85.160.53]) (using TLSv1 with cipher RC4-MD5 (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id B04CA431FBD\r
+       for <notmuch@notmuchmail.org>; Sat, 23 Jun 2012 20:28:25 -0700 (PDT)\r
+Received: by mail-pb0-f53.google.com with SMTP id rr13so6402052pbb.26\r
+       for <notmuch@notmuchmail.org>; Sat, 23 Jun 2012 20:28:25 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;\r
+       bh=1a4IzYi5jOEKR9XQ0XOE50dkPXhspg+5Zl1iVOfjexk=;\r
+       b=Q2XFWd3vLGV5ZPUStG5GCCi+6XwD4nyVeoLDDjiwjITtWZspqhcsq9Fy+5wNALUtzE\r
+       0ckRJGA8jhQYa5sckeSieW2pKvQFbaqPRrsR9wXeRpdvDhQmVpIgOrIN3KTuMG5tpPJY\r
+       huufg6Di0b8sRvMxs5PLDre3NAsHwHXFEaCMXOMFKs5MUDuFVR8Y+JD2KIZUdMbnPauo\r
+       POqFuRMlUMDEaUiwepPz2k5GlYbObSN4bf/0wajV6AXHXPq+O0cdV0wGAthquUQSywfK\r
+       2qXcdQ8wzvLi8f5vm/ZqKL4JRHMSbpwSqFHOO95DXWRIspaJZKfWSoF+QGr5htt7VdV2\r
+       6FAA==\r
+Received: by 10.68.203.7 with SMTP id km7mr26526742pbc.7.1340508505395;\r
+       Sat, 23 Jun 2012 20:28:25 -0700 (PDT)\r
+Received: from localhost (215.42.233.220.static.exetel.com.au.\r
+       [220.233.42.215])\r
+       by mx.google.com with ESMTPS id op10sm4072001pbc.75.2012.06.23.20.28.22\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Sat, 23 Jun 2012 20:28:24 -0700 (PDT)\r
+From: Peter Wang <novalazy@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 3/3] test: add test for showing Reply-To headers\r
+Date: Sun, 24 Jun 2012 13:27:50 +1000\r
+Message-Id: <1340508470-16606-3-git-send-email-novalazy@gmail.com>\r
+X-Mailer: git-send-email 1.7.4.4\r
+In-Reply-To: <1340508470-16606-1-git-send-email-novalazy@gmail.com>\r
+References: <1340508470-16606-1-git-send-email-novalazy@gmail.com>\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, 24 Jun 2012 03:28:26 -0000\r
+\r
+Test that show --format=text and --format=json now output\r
+Reply-To headers when present.\r
+---\r
+ test/json |    4 ++--\r
+ test/text |    3 ++-\r
+ 2 files changed, 4 insertions(+), 3 deletions(-)\r
+\r
+diff --git a/test/json b/test/json\r
+index 6439788..0a692ac 100755\r
+--- a/test/json\r
++++ b/test/json\r
+@@ -3,9 +3,9 @@ test_description="--format=json output"\r
+ . ./test-lib.sh\r
+ \r
+ test_begin_subtest "Show message: json"\r
+-add_message "[subject]=\"json-show-subject\"" "[date]=\"Sat, 01 Jan 2000 12:00:00 -0000\"" "[body]=\"json-show-message\""\r
++add_message "[subject]=\"json-show-subject\"" "[date]=\"Sat, 01 Jan 2000 12:00:00 -0000\"" "[body]=\"json-show-message\"" "[reply-to]=\"json-show-reply-to\""\r
+ output=$(notmuch show --format=json "json-show-message")\r
+-test_expect_equal "$output" "[[[{\"id\": \"${gen_msg_id}\", \"match\": true, \"excluded\": false, \"filename\": \"${gen_msg_filename}\", \"timestamp\": 946728000, \"date_relative\": \"2000-01-01\", \"tags\": [\"inbox\",\"unread\"], \"headers\": {\"Subject\": \"json-show-subject\", \"From\": \"Notmuch Test Suite <test_suite@notmuchmail.org>\", \"To\": \"Notmuch Test Suite <test_suite@notmuchmail.org>\", \"Date\": \"Sat, 01 Jan 2000 12:00:00 +0000\"}, \"body\": [{\"id\": 1, \"content-type\": \"text/plain\", \"content\": \"json-show-message\n\"}]}, []]]]"\r
++test_expect_equal "$output" "[[[{\"id\": \"${gen_msg_id}\", \"match\": true, \"excluded\": false, \"filename\": \"${gen_msg_filename}\", \"timestamp\": 946728000, \"date_relative\": \"2000-01-01\", \"tags\": [\"inbox\",\"unread\"], \"headers\": {\"Subject\": \"json-show-subject\", \"From\": \"Notmuch Test Suite <test_suite@notmuchmail.org>\", \"To\": \"Notmuch Test Suite <test_suite@notmuchmail.org>\", \"Reply-To\": \"json-show-reply-to\", \"Date\": \"Sat, 01 Jan 2000 12:00:00 +0000\"}, \"body\": [{\"id\": 1, \"content-type\": \"text/plain\", \"content\": \"json-show-message\n\"}]}, []]]]"\r
+ \r
+ test_begin_subtest "Search message: json"\r
+ add_message "[subject]=\"json-search-subject\"" "[date]=\"Sat, 01 Jan 2000 12:00:00 -0000\"" "[body]=\"json-search-message\""\r
+diff --git a/test/text b/test/text\r
+index 428c89b..bf1dfd1 100755\r
+--- a/test/text\r
++++ b/test/text\r
+@@ -3,7 +3,7 @@ test_description="--format=text output"\r
+ . ./test-lib.sh\r
+ \r
+ test_begin_subtest "Show message: text"\r
+-add_message "[subject]=\"text-show-subject\"" "[date]=\"Sat, 01 Jan 2000 12:00:00 -0000\"" "[body]=\"text-show-message\""\r
++add_message "[subject]=\"text-show-subject\"" "[date]=\"Sat, 01 Jan 2000 12:00:00 -0000\"" "[body]=\"text-show-message\"" "[reply-to]=\"text-show-reply-to\""\r
+ output=$(notmuch show --format=text "text-show-message" | notmuch_show_sanitize_all)\r
+ test_expect_equal "$output" "\\r
+ \f\r
+message{ id:XXXXX depth:0 match:1 excluded:0 filename:XXXXX\r
+@@ -12,6 +12,7 @@ Notmuch Test Suite <test_suite@notmuchmail.org> (2000-01-01) (inbox unread)\r
+ Subject: text-show-subject\r
+ From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+ To: Notmuch Test Suite <test_suite@notmuchmail.org>\r
++Reply-To: text-show-reply-to\r
+ Date: Sat, 01 Jan 2000 12:00:00 +0000\r
+ \f\r
+header}\r
+ \f\r
+body{\r
+-- \r
+1.7.4.4\r
+\r