[Patch v2 4/4] test: give unique timestamps to messages

diff --git a/b1/bf7cd4246efbc170332709550e36b4e3a4d781 b/b1/bf7cd4246efbc170332709550e36b4e3a4d781
new file mode 100644 (file)
index 0000000..52bf587
--- /dev/null
+++ b/b1/bf7cd4246efbc170332709550e36b4e3a4d781
@@ -0,0 +1,99 @@
+Return-Path: <bremner@tesseract.cs.unb.ca>\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 B1949429E2F\r
+       for <notmuch@notmuchmail.org>; Mon,  9 Dec 2013 05:37:49 -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 tests=[none]\r
+       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 bUDFyEbETP8f for <notmuch@notmuchmail.org>;\r
+       Mon,  9 Dec 2013 05:37:47 -0800 (PST)\r
+Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])\r
+       (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 1D455431FDA\r
+       for <notmuch@notmuchmail.org>; Mon,  9 Dec 2013 05:37:47 -0800 (PST)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+       (envelope-from <bremner@tesseract.cs.unb.ca>)\r
+       id 1Vq11s-0003FP-Jr; Mon, 09 Dec 2013 09:37:44 -0400\r
+Received: (nullmailer pid 27764 invoked by uid 1000); Mon, 09 Dec 2013\r
+       13:37:22 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [Patch v2 4/4] test: give unique timestamps to messages\r
+Date: Mon,  9 Dec 2013 21:36:31 +0800\r
+Message-Id: <1386596191-27683-4-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.8.4.3\r
+In-Reply-To: <1386596191-27683-1-git-send-email-david@tethera.net>\r
+References: <1386517946-22054-1-git-send-email-david@tethera.net>\r
+       <1386596191-27683-1-git-send-email-david@tethera.net>\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, 09 Dec 2013 13:37:50 -0000\r
+\r
+The choice of decreasing timestamps is a hack which reduces the number\r
+of existing tests which fail.  This can be changed to increasing\r
+if/when somebody wants update another 47 tests.\r
+---\r
+ test/excludes    | 4 ++--\r
+ test/test-lib.sh | 6 +++++-\r
+ 2 files changed, 7 insertions(+), 3 deletions(-)\r
+\r
+diff --git a/test/excludes b/test/excludes\r
+index f1ae9ea..8bbbc2d 100755\r
+--- a/test/excludes\r
++++ b/test/excludes\r
+@@ -67,7 +67,7 @@ thread:XXX   2001-01-05 [1/2] Notmuch Test Suite; Not deleted reply (deleted inb\r
+ test_begin_subtest "Search, don't exclude \"deleted\" messages when --exclude=flag specified"\r
+ output=$(notmuch search --exclude=flag subject:deleted | notmuch_search_sanitize)\r
+ test_expect_equal "$output" "thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; Not deleted (inbox unread)\r
+-thread:XXX   2001-01-05 [1/2] Notmuch Test Suite; Not deleted reply (deleted inbox unread)"\r
++thread:XXX   2001-01-05 [1/2] Notmuch Test Suite; Deleted (deleted inbox unread)"\r
+ \r
+ test_begin_subtest "Search, don't exclude \"deleted\" messages from search if not configured"\r
+ notmuch config set search.exclude_tags\r
+@@ -152,7 +152,7 @@ ${matching_message_ids[5]}"\r
+ test_begin_subtest "Search, exclude=flag (thread summary)"\r
+ output=$(notmuch search --exclude=flag tag:test | notmuch_search_sanitize)\r
+ test_expect_equal "$output" "thread:XXX   2001-01-05 [0/6] Notmuch Test Suite; All messages excluded: single match: reply 2 (deleted inbox test unread)\r
+-thread:XXX   2001-01-05 [0/6] Notmuch Test Suite; All messages excluded: double match: reply 4 (deleted inbox test unread)\r
++thread:XXX   2001-01-05 [0/6] Notmuch Test Suite; All messages excluded: double match: reply 2 (deleted inbox test unread)\r
+ thread:XXX   2001-01-05 [0/6] Notmuch Test Suite; Some messages excluded: single excluded match: reply 3 (deleted inbox test unread)\r
+ thread:XXX   2001-01-05 [1/6] Notmuch Test Suite; Some messages excluded: single non-excluded match: reply 4 (deleted inbox test unread)\r
+ thread:XXX   2001-01-05 [1/6] Notmuch Test Suite; No messages excluded: single match: reply 3 (inbox test unread)"\r
+diff --git a/test/test-lib.sh b/test/test-lib.sh\r
+index d22408d..53cb947 100644\r
+--- a/test/test-lib.sh\r
++++ b/test/test-lib.sh\r
+@@ -356,7 +356,11 @@ generate_message ()\r
+     fi\r
+ \r
+     if [ -z "${template[date]}" ]; then\r
+-      template[date]="Fri, 05 Jan 2001 15:43:57 +0000"\r
++      # we use decreasing timestamps here for historical reasons;\r
++      # the existing test suite when we converted to unique timestamps just\r
++      # happened to have signicantly fewer failures with that choice.\r
++      template[date]=$(TZ=UTC printf "%(%a, %d %b %Y %T %z)T\n" \\r
++                      $((978709437 - gen_msg_cnt)))\r
+     fi\r
+ \r
+     additional_headers=""\r
+-- \r
+1.8.4.3\r
+\r