Re: Possible bug in tests with emacs 23.2.1 (debian stable)

diff --git a/a5/ec79e49b2d648046e60203dc899518364607d0 b/a5/ec79e49b2d648046e60203dc899518364607d0
new file mode 100644 (file)
index 0000000..08ad48f
--- /dev/null
+++ b/a5/ec79e49b2d648046e60203dc899518364607d0
@@ -0,0 +1,107 @@
+Return-Path: <m.walters@qmul.ac.uk>\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 AA900429E42\r
+       for <notmuch@notmuchmail.org>; Tue,  3 Jan 2012 12:19:30 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.098\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5\r
+       tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+       NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] 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 CEjecyv9eO7T for <notmuch@notmuchmail.org>;\r
+       Tue,  3 Jan 2012 12:19:30 -0800 (PST)\r
+Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])\r
+       (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 22214431FD0\r
+       for <notmuch@notmuchmail.org>; Tue,  3 Jan 2012 12:19:30 -0800 (PST)\r
+Received: from smtp.qmul.ac.uk ([138.37.6.40])\r
+       by mail2.qmul.ac.uk with esmtp (Exim 4.71)\r
+       (envelope-from <m.walters@qmul.ac.uk>)\r
+       id 1RiApQ-0004uE-05; Tue, 03 Jan 2012 20:19:24 +0000\r
+Received: from 94-192-233-223.zone6.bethere.co.uk ([94.192.233.223]\r
+       helo=localhost)\r
+       by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69)\r
+       (envelope-from <m.walters@qmul.ac.uk>)\r
+       id 1RiApP-0002Qe-Pg; Tue, 03 Jan 2012 20:19:23 +0000\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: Tomi Ollila <tomi.ollila@nixu.com>, Tomi Ollila <tomi.ollila@iki.fi>,\r
+       notmuch@notmuchmail.org\r
+Subject: Re: Possible bug in tests with emacs 23.2.1 (debian stable)\r
+In-Reply-To: <yf67h19ylxj.fsf@taco2.nixu.fi>\r
+References:\r
+ <CALUdzSWfmRQ6F8ocgZQEcPpkBNgnC+zO0Pje2w6nczn0JyCbnA@mail.gmail.com>\r
+       <yf6aa66ywzy.fsf@taco2.nixu.fi> <yf67h19ylxj.fsf@taco2.nixu.fi>\r
+User-Agent: Notmuch/0.10+44~gded5e61 (http://notmuchmail.org) Emacs/23.3.1\r
+       (i486-pc-linux-gnu)\r
+Date: Tue, 03 Jan 2012 20:19:23 +0000\r
+Message-ID: <87d3b01qus.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 94.192.233.223\r
+X-QM-SPAM-Info: Sender has good ham record.  :)\r
+X-QM-Body-MD5: 79be8d47e6067633500a62bb3e05e5ac (of first 20000 bytes)\r
+X-SpamAssassin-Score: -1.8\r
+X-SpamAssassin-SpamBar: -\r
+X-SpamAssassin-Report: The QM spam filters have analysed this message to\r
+       determine if it is\r
+       spam. We require at least 5.0 points to mark a message as spam.\r
+       This message scored -1.8 points.\r
+       Summary of the scoring: \r
+       * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/,\r
+       *      medium trust\r
+       *      [138.37.6.40 listed in list.dnswl.org]\r
+       * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+       provider *      (markwalters1009[at]gmail.com)\r
+       *  0.5 AWL AWL: From: address is in the auto white-list\r
+X-QM-Scan-Virus: ClamAV says the message is clean\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: Tue, 03 Jan 2012 20:19:30 -0000\r
+\r
+\r
+On Tue, 03 Jan 2012 15:07:04 +0200, Tomi Ollila <tomi.ollila@nixu.com> wrote:\r
+\r
+> I did some more testing; doing\r
+> \r
+> emacsclient --eval '(defun yes-or-no-p (prompt) t)' --eval '(kill-emacs)'\r
+> \r
+> Will make emacs 23.2.1 exit also, so IMO this "workaround" could be\r
+> used to "fix" the problem. \r
+\r
+I can confirm that the patch below (using this suggestion) fixes the\r
+tests for me on emacs 23.2.1 and, on a different machine with emacs\r
+23.3.1 they work just as before.\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+diff --git a/test/test-lib.sh b/test/test-lib.sh\r
+index 82767c0..218ce91 100644\r
+--- a/test/test-lib.sh\r
++++ b/test/test-lib.sh\r
+@@ -866,7 +866,7 @@ test_done () {\r
+ \r
+       echo\r
+ \r
+-      [ -n "$EMACS_SERVER" ] && test_emacs '(kill-emacs)'\r
++      [ -n "$EMACS_SERVER" ] && test_emacs '(defun yes-or-no-p (prompt) t) (kill-emacs)'\r
+ \r
+       if [ "$test_failure" = "0" ]; then\r
+           if [ "$test_broken" = "0" ]; then       \r