1 Return-Path: <bremner@tesseract.cs.unb.ca>
\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 1F04A429E27
\r
6 for <notmuch@notmuchmail.org>; Sun, 8 Dec 2013 07:53:20 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id l4RoM8RF+eCl for <notmuch@notmuchmail.org>;
\r
16 Sun, 8 Dec 2013 07:53:16 -0800 (PST)
\r
17 Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])
\r
18 (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id 94CFC429E29
\r
21 for <notmuch@notmuchmail.org>; Sun, 8 Dec 2013 07:53:02 -0800 (PST)
\r
22 Received: from remotemail by yantan.tethera.net with local (Exim 4.80)
\r
23 (envelope-from <bremner@tesseract.cs.unb.ca>)
\r
24 id 1VpgfG-0006AZ-6Y; Sun, 08 Dec 2013 11:53:02 -0400
\r
25 Received: (nullmailer pid 22784 invoked by uid 1000); Sun, 08 Dec 2013
\r
27 From: David Bremner <david@tethera.net>
\r
28 To: notmuch@notmuchmail.org
\r
29 Subject: [PATCH 4/4] test: give unique timestamps to messages
\r
30 Date: Sun, 8 Dec 2013 23:52:26 +0800
\r
31 Message-Id: <1386517946-22054-5-git-send-email-david@tethera.net>
\r
32 X-Mailer: git-send-email 1.8.4.3
\r
33 In-Reply-To: <1386517946-22054-1-git-send-email-david@tethera.net>
\r
34 References: <1386517946-22054-1-git-send-email-david@tethera.net>
\r
35 X-BeenThere: notmuch@notmuchmail.org
\r
36 X-Mailman-Version: 2.1.13
\r
38 List-Id: "Use and development of the notmuch mail system."
\r
39 <notmuch.notmuchmail.org>
\r
40 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
41 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
42 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
43 List-Post: <mailto:notmuch@notmuchmail.org>
\r
44 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
45 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
46 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
47 X-List-Received-Date: Sun, 08 Dec 2013 15:53:20 -0000
\r
49 The choice of decreasing timestamps is a hack which reduces the number
\r
50 of existing tests which fail. This can be changed to increasing
\r
51 if/when somebody wants update another 47 tests.
\r
53 test/excludes | 4 ++--
\r
54 test/test-lib.sh | 2 +-
\r
55 2 files changed, 3 insertions(+), 3 deletions(-)
\r
57 diff --git a/test/excludes b/test/excludes
\r
58 index f1ae9ea..8bbbc2d 100755
\r
61 @@ -67,7 +67,7 @@ thread:XXX 2001-01-05 [1/2] Notmuch Test Suite; Not deleted reply (deleted inb
\r
62 test_begin_subtest "Search, don't exclude \"deleted\" messages when --exclude=flag specified"
\r
63 output=$(notmuch search --exclude=flag subject:deleted | notmuch_search_sanitize)
\r
64 test_expect_equal "$output" "thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; Not deleted (inbox unread)
\r
65 -thread:XXX 2001-01-05 [1/2] Notmuch Test Suite; Not deleted reply (deleted inbox unread)"
\r
66 +thread:XXX 2001-01-05 [1/2] Notmuch Test Suite; Deleted (deleted inbox unread)"
\r
68 test_begin_subtest "Search, don't exclude \"deleted\" messages from search if not configured"
\r
69 notmuch config set search.exclude_tags
\r
70 @@ -152,7 +152,7 @@ ${matching_message_ids[5]}"
\r
71 test_begin_subtest "Search, exclude=flag (thread summary)"
\r
72 output=$(notmuch search --exclude=flag tag:test | notmuch_search_sanitize)
\r
73 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
74 -thread:XXX 2001-01-05 [0/6] Notmuch Test Suite; All messages excluded: double match: reply 4 (deleted inbox test unread)
\r
75 +thread:XXX 2001-01-05 [0/6] Notmuch Test Suite; All messages excluded: double match: reply 2 (deleted inbox test unread)
\r
76 thread:XXX 2001-01-05 [0/6] Notmuch Test Suite; Some messages excluded: single excluded match: reply 3 (deleted inbox test unread)
\r
77 thread:XXX 2001-01-05 [1/6] Notmuch Test Suite; Some messages excluded: single non-excluded match: reply 4 (deleted inbox test unread)
\r
78 thread:XXX 2001-01-05 [1/6] Notmuch Test Suite; No messages excluded: single match: reply 3 (inbox test unread)"
\r
79 diff --git a/test/test-lib.sh b/test/test-lib.sh
\r
80 index d238c66..792e477 100644
\r
81 --- a/test/test-lib.sh
\r
82 +++ b/test/test-lib.sh
\r
83 @@ -356,7 +356,7 @@ generate_message ()
\r
86 if [ -z "${template[date]}" ]; then
\r
87 - template[date]="Fri, 05 Jan 2001 15:43:57 +0000"
\r
88 + template[date]=$(date -Ru -d@$((978709437 - gen_msg_cnt)))
\r
91 additional_headers=""
\r