Re: [PATCH 4/4] test: give unique timestamps to messages

diff --git a/73/511a6b285a45e9cba704963f72c75cab32d941 b/73/511a6b285a45e9cba704963f72c75cab32d941
new file mode 100644 (file)
index 0000000..66d3d31
--- /dev/null
+++ b/73/511a6b285a45e9cba704963f72c75cab32d941
@@ -0,0 +1,104 @@
+Return-Path: <tomi.ollila@iki.fi>\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 17857431FDC\r
+       for <notmuch@notmuchmail.org>; Sun,  8 Dec 2013 11:06:44 -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 659z2WLykC4b for <notmuch@notmuchmail.org>;\r
+       Sun,  8 Dec 2013 11:06:20 -0800 (PST)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id 529D2431FD6\r
+       for <notmuch@notmuchmail.org>; Sun,  8 Dec 2013 11:06:20 -0800 (PST)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id DDC1110005D;\r
+       Sun,  8 Dec 2013 21:06:15 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 4/4] test: give unique timestamps to messages\r
+In-Reply-To: <1386517946-22054-5-git-send-email-david@tethera.net>\r
+References: <1386517946-22054-1-git-send-email-david@tethera.net>\r
+       <1386517946-22054-5-git-send-email-david@tethera.net>\r
+User-Agent: Notmuch/0.17~rc1+17~ga2e1a2f (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+       $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+       !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Sun, 08 Dec 2013 21:06:15 +0200\r
+Message-ID: <m28uvvnowo.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\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: Sun, 08 Dec 2013 19:06:44 -0000\r
+\r
+On Sun, Dec 08 2013, David Bremner <david@tethera.net> wrote:\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 | 2 +-\r
+>  2 files changed, 3 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 d238c66..792e477 100644\r
+> --- a/test/test-lib.sh\r
+> +++ b/test/test-lib.sh\r
+> @@ -356,7 +356,7 @@ generate_message ()\r
+>      fi\r
+>  \r
+>      if [ -z "${template[date]}" ]; then\r
+> -    template[date]="Fri, 05 Jan 2001 15:43:57 +0000"\r
+> +    template[date]=$(date -Ru -d@$((978709437 - gen_msg_cnt)))\r
+\r
+I am afraid this is not portable (although not sure). This could work:\r
+\r
+_s=$((3599 - gen_msg_cnt))\r
+template[date]="Fri, 05 Jan 2001 15:$((_s / 60)):$((_s % 60)) +0000"\r
+\r
+>      fi\r
+>  \r
+>      additional_headers=""\r
+\r
+Tomi (comments in hurry, after more careful examination done earlyer :)\r