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