[PATCH 2/3] test: Expect `date_relative' in JSON search output.

diff --git a/d2/d1a3fe02eb53178acf5c6e2a8abc628461a4bf b/d2/d1a3fe02eb53178acf5c6e2a8abc628461a4bf
new file mode 100644 (file)
index 0000000..4ee1f57
--- /dev/null
+++ b/d2/d1a3fe02eb53178acf5c6e2a8abc628461a4bf
@@ -0,0 +1,82 @@
+Return-Path: <dme@dme.org>\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 64875431FB5\r
+       for <notmuch@notmuchmail.org>; Mon, 29 Nov 2010 02:30:43 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_NONE=-0.0001] 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 N6BYj14OunQ6 for <notmuch@notmuchmail.org>;\r
+       Mon, 29 Nov 2010 02:30:42 -0800 (PST)\r
+Received: from mail-ww0-f45.google.com (mail-ww0-f45.google.com\r
+ [74.125.82.45])       by olra.theworths.org (Postfix) with ESMTP id 4F532431FB6       for\r
+ <notmuch@notmuchmail.org>; Mon, 29 Nov 2010 02:30:42 -0800 (PST)\r
+Received: by wwi17 with SMTP id 17so52762wwi.2\r
+       for <notmuch@notmuchmail.org>; Mon, 29 Nov 2010 02:30:41 -0800 (PST)\r
+Received: by 10.216.52.199 with SMTP id e49mr4498460wec.63.1291026641399;\r
+       Mon, 29 Nov 2010 02:30:41 -0800 (PST)\r
+Received: from ut.hh.sledj.net (host81-149-164-25.in-addr.btopenworld.com\r
+       [81.149.164.25])\r
+       by mx.google.com with ESMTPS id w29sm2293644weq.19.2010.11.29.02.30.39\r
+       (version=TLSv1/SSLv3 cipher=RC4-MD5);\r
+       Mon, 29 Nov 2010 02:30:40 -0800 (PST)\r
+Received: by ut.hh.sledj.net (Postfix, from userid 1000)\r
+       id 35A0D594241; Mon, 29 Nov 2010 10:30:07 +0000 (GMT)\r
+From: David Edmondson <dme@dme.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/3] test: Expect `date_relative' in JSON search output.\r
+Date: Mon, 29 Nov 2010 10:29:58 +0000\r
+Message-Id: <1291026599-14795-3-git-send-email-dme@dme.org>\r
+X-Mailer: git-send-email 1.7.2.3\r
+In-Reply-To: <1291026599-14795-1-git-send-email-dme@dme.org>\r
+References: <1291026599-14795-1-git-send-email-dme@dme.org>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=UTF-8\r
+Content-Transfer-Encoding: 8bit\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: Mon, 29 Nov 2010 10:30:43 -0000\r
+\r
+---\r
+ test/json |    2 ++\r
+ 1 files changed, 2 insertions(+), 0 deletions(-)\r
+\r
+diff --git a/test/json b/test/json\r
+index 7fe2a27..c0ff22d 100755\r
+--- a/test/json\r
++++ b/test/json\r
+@@ -12,6 +12,7 @@ add_message "[subject]=\"json-search-subject\"" "[date]=\"Sat, 01 Jan 2000 12:00\r
+ output=$(notmuch search --format=json "json-search-message" | notmuch_search_sanitize)\r
+ test_expect_equal "$output" "[{\"thread\": \"XXX\",\r
+ \"timestamp\": 946728000,\r
++\"date_relative\": \"2000-01-01\",\r
+ \"matched\": 1,\r
+ \"total\": 1,\r
+ \"authors\": \"Notmuch Test Suite\",\r
+@@ -33,6 +34,7 @@ add_message "[subject]=\"json-search-utf8-body-sübjéct\"" "[date]=\"Sat, 01 Ja\r
+ output=$(notmuch search --format=json "jsön-search-méssage" | notmuch_search_sanitize)\r
+ test_expect_equal "$output" "[{\"thread\": \"XXX\",\r
+ \"timestamp\": 946728000,\r
++\"date_relative\": \"2000-01-01\",\r
+ \"matched\": 1,\r
+ \"total\": 1,\r
+ \"authors\": \"Notmuch Test Suite\",\r
+-- \r
+1.7.2.3\r
+\r