From 12a45bc8b022c191b54762f5a31fbbb5780230b1 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Tue, 29 Dec 2015 09:52:17 +0100 Subject: [PATCH] [PATCH v2] test: Unset ALTERNATE_EDITOR before running emacsclient --- 85/6fbef71b39483745986d684fe0164a4f61c439 | 86 +++++++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 85/6fbef71b39483745986d684fe0164a4f61c439 diff --git a/85/6fbef71b39483745986d684fe0164a4f61c439 b/85/6fbef71b39483745986d684fe0164a4f61c439 new file mode 100644 index 000000000..1e31909eb --- /dev/null +++ b/85/6fbef71b39483745986d684fe0164a4f61c439 @@ -0,0 +1,86 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by arlo.cworth.org (Postfix) with ESMTP id 6EBDD6DE17AC + for ; Tue, 29 Dec 2015 00:52:36 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at cworth.org +X-Spam-Flag: NO +X-Spam-Score: -1.411 +X-Spam-Level: +X-Spam-Status: No, score=-1.411 tagged_above=-999 required=5 tests=[AWL=1.439, + RCVD_IN_DNSWL_MED=-2.3, RP_MATCHES_RCVD=-0.55] autolearn=disabled +Received: from arlo.cworth.org ([127.0.0.1]) + by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id GIqPcCHdWV_S for ; + Tue, 29 Dec 2015 00:52:34 -0800 (PST) +Received: from max.feld.cvut.cz (max.feld.cvut.cz [147.32.192.36]) + by arlo.cworth.org (Postfix) with ESMTP id DE99B6DE179D + for ; Tue, 29 Dec 2015 00:52:33 -0800 (PST) +Received: from localhost (unknown [192.168.200.7]) + by max.feld.cvut.cz (Postfix) with ESMTP id 6402B19F466F + for ; Tue, 29 Dec 2015 09:52:31 +0100 (CET) +X-Virus-Scanned: IMAP STYX AMAVIS +Received: from max.feld.cvut.cz ([192.168.200.1]) + by localhost (styx.feld.cvut.cz [192.168.200.7]) (amavisd-new, port 10044) + with ESMTP id OVtfknc14r0E for ; + Tue, 29 Dec 2015 09:52:29 +0100 (CET) +Received: from imap.feld.cvut.cz (imap.feld.cvut.cz [147.32.192.34]) + by max.feld.cvut.cz (Postfix) with ESMTP id E250B19F43D1 + for ; Tue, 29 Dec 2015 09:52:29 +0100 (CET) +Received: from wsh by steelpick.2x.cz with local (Exim 4.86) + (envelope-from ) + id 1aDq17-0003jo-Gw; Tue, 29 Dec 2015 09:52:29 +0100 +From: Michal Sojka +To: notmuch@notmuchmail.org +Subject: [PATCH v2] test: Unset ALTERNATE_EDITOR before running emacsclient +Date: Tue, 29 Dec 2015 09:52:17 +0100 +Message-Id: <1451379137-14330-1-git-send-email-sojkam1@fel.cvut.cz> +X-Mailer: git-send-email 2.6.4 +In-Reply-To: +References: +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.20 +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: Tue, 29 Dec 2015 08:52:36 -0000 + +ALTERNATE_EDITOR causes emacsclient to run an alternate editor if the +emacs server is not ready. This can collide with intended +functionality in test-lib.sh. + +If the ALTERNATE_EDITOR is set but empty, emacsclient runs emacs +daemon and tries to connect to it. When this happens the emacs run by +test-lib.sh fails to start the server and the subsequent attempts to +use the server fail because the daemon started by emacsclient does not +know about notmuch-test-progn. This leads to test suite failure due to +time out on any emacs test. +--- + test/test-lib.sh | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/test/test-lib.sh b/test/test-lib.sh +index 126911f..270c718 100644 +--- a/test/test-lib.sh ++++ b/test/test-lib.sh +@@ -82,6 +82,9 @@ unset CDPATH + + unset GREP_OPTIONS + ++# For emacsclient ++unset ALTERNATE_EDITOR ++ + # Convenience + # + # A regexp to match 5 and 40 hexdigits +-- +2.6.4 + -- 2.26.2