From: David Bremner Date: Sun, 8 Dec 2013 15:52:26 +0000 (+0800) Subject: [PATCH 4/4] test: give unique timestamps to messages X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=97f63ea7e270cb4cec6f3eb613b57776ab088cb2;p=notmuch-archives.git [PATCH 4/4] test: give unique timestamps to messages --- diff --git a/95/1587e1723edde3fcb3eba3fe2994c6fb0affd7 b/95/1587e1723edde3fcb3eba3fe2994c6fb0affd7 new file mode 100644 index 000000000..841452a0c --- /dev/null +++ b/95/1587e1723edde3fcb3eba3fe2994c6fb0affd7 @@ -0,0 +1,94 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 1F04A429E27 + for ; Sun, 8 Dec 2013 07:53:20 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id l4RoM8RF+eCl for ; + Sun, 8 Dec 2013 07:53:16 -0800 (PST) +Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155]) + (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 94CFC429E29 + for ; Sun, 8 Dec 2013 07:53:02 -0800 (PST) +Received: from remotemail by yantan.tethera.net with local (Exim 4.80) + (envelope-from ) + id 1VpgfG-0006AZ-6Y; Sun, 08 Dec 2013 11:53:02 -0400 +Received: (nullmailer pid 22784 invoked by uid 1000); Sun, 08 Dec 2013 + 15:52:31 -0000 +From: David Bremner +To: notmuch@notmuchmail.org +Subject: [PATCH 4/4] test: give unique timestamps to messages +Date: Sun, 8 Dec 2013 23:52:26 +0800 +Message-Id: <1386517946-22054-5-git-send-email-david@tethera.net> +X-Mailer: git-send-email 1.8.4.3 +In-Reply-To: <1386517946-22054-1-git-send-email-david@tethera.net> +References: <1386517946-22054-1-git-send-email-david@tethera.net> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Sun, 08 Dec 2013 15:53:20 -0000 + +The choice of decreasing timestamps is a hack which reduces the number +of existing tests which fail. This can be changed to increasing +if/when somebody wants update another 47 tests. +--- + test/excludes | 4 ++-- + test/test-lib.sh | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/test/excludes b/test/excludes +index f1ae9ea..8bbbc2d 100755 +--- a/test/excludes ++++ b/test/excludes +@@ -67,7 +67,7 @@ thread:XXX 2001-01-05 [1/2] Notmuch Test Suite; Not deleted reply (deleted inb + test_begin_subtest "Search, don't exclude \"deleted\" messages when --exclude=flag specified" + output=$(notmuch search --exclude=flag subject:deleted | notmuch_search_sanitize) + test_expect_equal "$output" "thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; Not deleted (inbox unread) +-thread:XXX 2001-01-05 [1/2] Notmuch Test Suite; Not deleted reply (deleted inbox unread)" ++thread:XXX 2001-01-05 [1/2] Notmuch Test Suite; Deleted (deleted inbox unread)" + + test_begin_subtest "Search, don't exclude \"deleted\" messages from search if not configured" + notmuch config set search.exclude_tags +@@ -152,7 +152,7 @@ ${matching_message_ids[5]}" + test_begin_subtest "Search, exclude=flag (thread summary)" + output=$(notmuch search --exclude=flag tag:test | notmuch_search_sanitize) + 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) +-thread:XXX 2001-01-05 [0/6] Notmuch Test Suite; All messages excluded: double match: reply 4 (deleted inbox test unread) ++thread:XXX 2001-01-05 [0/6] Notmuch Test Suite; All messages excluded: double match: reply 2 (deleted inbox test unread) + thread:XXX 2001-01-05 [0/6] Notmuch Test Suite; Some messages excluded: single excluded match: reply 3 (deleted inbox test unread) + thread:XXX 2001-01-05 [1/6] Notmuch Test Suite; Some messages excluded: single non-excluded match: reply 4 (deleted inbox test unread) + thread:XXX 2001-01-05 [1/6] Notmuch Test Suite; No messages excluded: single match: reply 3 (inbox test unread)" +diff --git a/test/test-lib.sh b/test/test-lib.sh +index d238c66..792e477 100644 +--- a/test/test-lib.sh ++++ b/test/test-lib.sh +@@ -356,7 +356,7 @@ generate_message () + fi + + if [ -z "${template[date]}" ]; then +- template[date]="Fri, 05 Jan 2001 15:43:57 +0000" ++ template[date]=$(date -Ru -d@$((978709437 - gen_msg_cnt))) + fi + + additional_headers="" +-- +1.8.4.3 +