From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Tue, 29 Dec 2015 08:52:17 +0000 (+0100)
Subject: test: Unset ALTERNATE_EDITOR before running emacsclient
X-Git-Tag: 0.22_rc0~93
X-Git-Url: https://git.cworth.org/git?p=notmuch;a=commitdiff_plain;h=a9fec12a0804113596c927d45f627f8b874aab67

test: Unset ALTERNATE_EDITOR before running emacsclient

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.
---

diff --git a/test/test-lib.sh b/test/test-lib.sh
index 126911fb..270c718b 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