From b538f211b7ba5b5b51122dd79a539c69a8a4fd8e Mon Sep 17 00:00:00 2001 From: David Bremner Date: Mon, 9 Dec 2013 21:36:31 +0800 Subject: [PATCH] [Patch v2 4/4] test: give unique timestamps to messages --- b1/bf7cd4246efbc170332709550e36b4e3a4d781 | 99 +++++++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100644 b1/bf7cd4246efbc170332709550e36b4e3a4d781 diff --git a/b1/bf7cd4246efbc170332709550e36b4e3a4d781 b/b1/bf7cd4246efbc170332709550e36b4e3a4d781 new file mode 100644 index 000000000..52bf58731 --- /dev/null +++ b/b1/bf7cd4246efbc170332709550e36b4e3a4d781 @@ -0,0 +1,99 @@ +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 B1949429E2F + for ; Mon, 9 Dec 2013 05:37:49 -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 bUDFyEbETP8f for ; + Mon, 9 Dec 2013 05:37:47 -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 1D455431FDA + for ; Mon, 9 Dec 2013 05:37:47 -0800 (PST) +Received: from remotemail by yantan.tethera.net with local (Exim 4.80) + (envelope-from ) + id 1Vq11s-0003FP-Jr; Mon, 09 Dec 2013 09:37:44 -0400 +Received: (nullmailer pid 27764 invoked by uid 1000); Mon, 09 Dec 2013 + 13:37:22 -0000 +From: David Bremner +To: notmuch@notmuchmail.org +Subject: [Patch v2 4/4] test: give unique timestamps to messages +Date: Mon, 9 Dec 2013 21:36:31 +0800 +Message-Id: <1386596191-27683-4-git-send-email-david@tethera.net> +X-Mailer: git-send-email 1.8.4.3 +In-Reply-To: <1386596191-27683-1-git-send-email-david@tethera.net> +References: <1386517946-22054-1-git-send-email-david@tethera.net> + <1386596191-27683-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: Mon, 09 Dec 2013 13:37:50 -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 | 6 +++++- + 2 files changed, 7 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 d22408d..53cb947 100644 +--- a/test/test-lib.sh ++++ b/test/test-lib.sh +@@ -356,7 +356,11 @@ generate_message () + fi + + if [ -z "${template[date]}" ]; then +- template[date]="Fri, 05 Jan 2001 15:43:57 +0000" ++ # we use decreasing timestamps here for historical reasons; ++ # the existing test suite when we converted to unique timestamps just ++ # happened to have signicantly fewer failures with that choice. ++ template[date]=$(TZ=UTC printf "%(%a, %d %b %Y %T %z)T\n" \ ++ $((978709437 - gen_msg_cnt))) + fi + + additional_headers="" +-- +1.8.4.3 + -- 2.26.2