[PATCH 2/2] test: emacs: run list-processes after accept-process-output in emacs...

diff --git a/75/820c23928709f3a09a52b8e921f9403f9ff917 b/75/820c23928709f3a09a52b8e921f9403f9ff917
new file mode 100644 (file)
index 0000000..ae9385d
--- /dev/null
+++ b/75/820c23928709f3a09a52b8e921f9403f9ff917
@@ -0,0 +1,87 @@
+Return-Path: <too@guru-group.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 9D21D431FAF\r
+       for <notmuch@notmuchmail.org>; Sun,  5 Aug 2012 04:12:55 -0700 (PDT)\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 ENIGpsRNgdra for <notmuch@notmuchmail.org>;\r
+       Sun,  5 Aug 2012 04:12:55 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id 25F34431FAE\r
+       for <notmuch@notmuchmail.org>; Sun,  5 Aug 2012 04:12:55 -0700 (PDT)\r
+Received: by guru.guru-group.fi (Postfix, from userid 501)\r
+       id 7ACFF100387; Sun,  5 Aug 2012 14:13:05 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/2] test: emacs: run list-processes after\r
+       accept-process-output in emacs 23.1\r
+Date: Sun,  5 Aug 2012 14:13:02 +0300\r
+Message-Id: <1344165182-29246-2-git-send-email-tomi.ollila@iki.fi>\r
+X-Mailer: git-send-email 1.7.1\r
+In-Reply-To: <1344165182-29246-1-git-send-email-tomi.ollila@iki.fi>\r
+References: <1344165182-29246-1-git-send-email-tomi.ollila@iki.fi>\r
+Cc: Tomi Ollila <tomi.ollila@iki.fi>\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, 05 Aug 2012 11:12:55 -0000\r
+\r
+When running emacs tests using emacs 23.1.1 the tests block (until timeout)\r
+when emacs function (notmuch-test-wait) is called.\r
+\r
+There is an emacs bug #2930 titled:\r
+23.0.92; `accept-process-output' and `sleep-for' do not run sentinel\r
+\r
+It seems this is present in emacs 23.1.\r
+\r
+Calling list-processes after accept-process-output seems work around\r
+this problem; in case Emacs version is 23.1 a defadvice is activated\r
+to do just that.\r
+---\r
+\r
+Thanks to Austin for the comments and IRC discussions on the matter.\r
+\r
+ test/test-lib.el |    8 ++++++++\r
+ 1 files changed, 8 insertions(+), 0 deletions(-)\r
+\r
+diff --git a/test/test-lib.el b/test/test-lib.el\r
+index 52d9936..4330352 100644\r
+--- a/test/test-lib.el\r
++++ b/test/test-lib.el\r
+@@ -35,6 +35,16 @@\r
+     "Disable yes-or-no-p before executing kill-emacs"\r
+     (defun yes-or-no-p (prompt) t)))\r
+ \r
++;; Emacs bug #2930:\r
++;;    23.0.92; `accept-process-output' and `sleep-for' do not run sentinels\r
++;; seems to be present in Emacs 23.1.\r
++;; Running `list-processes' after `accept-process-output' seems to work\r
++;; around this problem.\r
++(if (and (= emacs-major-version 23) (= emacs-minor-version 1))\r
++  (defadvice accept-process-output (after run-list-processes activate)\r
++    "run list-processes after executing accept-process-output"\r
++    (list-processes)))\r
++\r
+ (defun notmuch-test-wait ()\r
+   "Wait for process completion."\r
+   (while (get-buffer-process (current-buffer))\r
+-- \r
+1.7.1\r
+\r