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 E2C12431FAF
\r
6 for <notmuch@notmuchmail.org>; Mon, 23 Jul 2012 09:17:35 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\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 YvjzPcYxmoI2 for <notmuch@notmuchmail.org>;
\r
18 Mon, 23 Jul 2012 09:17:34 -0700 (PDT)
\r
19 Received: from mail-wg0-f45.google.com (mail-wg0-f45.google.com
\r
20 [74.125.82.45]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client
\r
21 certificate requested) by olra.theworths.org (Postfix) with ESMTPS id
\r
22 22B3F431FC4 for <notmuch@notmuchmail.org>; Mon, 23 Jul 2012 09:17:31 -0700
\r
24 Received: by wgbdt14 with SMTP id dt14so4951441wgb.2
\r
25 for <notmuch@notmuchmail.org>; Mon, 23 Jul 2012 09:17:29 -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=yfYE+//obOnHYjfRaSnSSvMW9cPetGf0Y1+gUFlfj64=;
\r
29 b=EPJVEy61+HkLVcspKlJzgVBO6OTyVLOlN+KBZDtSjAlwVNdTrj5LZGdsU2fn0QyZCJ
\r
30 t0mVRgE3I7dljfMcH/l03kNiwQhwirNjrvxD5MB+KPG/OxNm8A1qczGzFT2lJ11X5JeV
\r
31 P1jF2sHjN3Nz8FOTDDmNyKOEGkvZOcQnDYSP4EJbolXiHoLvhi+7dSlGWV6ciSnH4wyP
\r
32 i6XFSYK5s4cFQ3PluvSFXWIMyRt/gqkwucZeGyj4PXloO5vQTOvV1eHChckxAEBXc9BS
\r
33 7KXIPHt1jt7H0azGop8XKQyWO2NpTgG3eAVtl1Y/bORCeGtq4UmCBeS6rtqnbsyZTVUq
\r
35 Received: by 10.180.92.7 with SMTP id ci7mr32959949wib.1.1343060249905;
\r
36 Mon, 23 Jul 2012 09:17:29 -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 bc2sm26167005wib.0.2012.07.23.09.17.28 (version=TLSv1/SSLv3 cipher=OTHER);
\r
40 Mon, 23 Jul 2012 09:17:29 -0700 (PDT)
\r
41 From: Mark Walters <markwalters1009@gmail.com>
\r
42 To: notmuch@notmuchmail.org
\r
43 Subject: [PATCH 2/4] test: add tests for the new --body=true|false option
\r
44 Date: Mon, 23 Jul 2012 17:17:19 +0100
\r
45 Message-Id: <1343060241-18283-3-git-send-email-markwalters1009@gmail.com>
\r
46 X-Mailer: git-send-email 1.7.9.1
\r
47 In-Reply-To: <1343060241-18283-1-git-send-email-markwalters1009@gmail.com>
\r
48 References: <1343060241-18283-1-git-send-email-markwalters1009@gmail.com>
\r
49 X-BeenThere: notmuch@notmuchmail.org
\r
50 X-Mailman-Version: 2.1.13
\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, 23 Jul 2012 16:17:36 -0000
\r
64 test/json | 9 +++++++++
\r
65 1 files changed, 9 insertions(+), 0 deletions(-)
\r
67 diff --git a/test/json b/test/json
\r
68 index 6439788..709b34f 100755
\r
71 @@ -7,6 +7,15 @@ add_message "[subject]=\"json-show-subject\"" "[date]=\"Sat, 01 Jan 2000 12:00:0
\r
72 output=$(notmuch show --format=json "json-show-message")
\r
73 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
75 +# This should be the same output as above.
\r
76 +test_begin_subtest "Show message: json --body=true"
\r
77 +output=$(notmuch show --format=json --body=true "json-show-message")
\r
78 +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
80 +test_begin_subtest "Show message: json --body=false"
\r
81 +output=$(notmuch show --format=json --body=false "json-show-message")
\r
82 +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\"}}, []]]]"
\r
84 test_begin_subtest "Search message: json"
\r
85 add_message "[subject]=\"json-search-subject\"" "[date]=\"Sat, 01 Jan 2000 12:00:00 -0000\"" "[body]=\"json-search-message\""
\r
86 output=$(notmuch search --format=json "json-search-message" | notmuch_search_sanitize)
\r