Re: [PATCH] test: Unset ALTERNATE_EDITOR before running emacsclient

diff --git a/9e/5b49f013f1a3706e817226803fe696cf499a19 b/9e/5b49f013f1a3706e817226803fe696cf499a19
new file mode 100644 (file)
index 0000000..0e9b958
--- /dev/null
+++ b/9e/5b49f013f1a3706e817226803fe696cf499a19
@@ -0,0 +1,93 @@
+Return-Path: <tomi.ollila@iki.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 arlo.cworth.org (Postfix) with ESMTP id E48866DE1772\r
+ for <notmuch@notmuchmail.org>; Mon, 28 Dec 2015 14:29:05 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.686\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.686 tagged_above=-999 required=5 tests=[AWL=0.034, \r
+ SPF_NEUTRAL=0.652] autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id RrWdihuCe3qW for <notmuch@notmuchmail.org>;\r
+ Mon, 28 Dec 2015 14:29:03 -0800 (PST)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 111B16DE176C\r
+ for <notmuch@notmuchmail.org>; Mon, 28 Dec 2015 14:29:02 -0800 (PST)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+ by guru.guru-group.fi (Postfix) with ESMTP id 3E88E10008E;\r
+ Tue, 29 Dec 2015 00:29:20 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: Michal Sojka <sojkam1@fel.cvut.cz>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] test: Unset ALTERNATE_EDITOR before running emacsclient\r
+In-Reply-To: <1451337395-14196-1-git-send-email-sojkam1@fel.cvut.cz>\r
+References: <1451337395-14196-1-git-send-email-sojkam1@fel.cvut.cz>\r
+User-Agent: Notmuch/0.21+32~g73439f8 (http://notmuchmail.org) Emacs/24.3.1\r
+ (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+ $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+ !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Tue, 29 Dec 2015 00:29:19 +0200\r
+Message-ID: <m28u4e2on4.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://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: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Mon, 28 Dec 2015 22:29:06 -0000\r
+\r
+On Mon, Dec 28 2015, Michal Sojka <sojkam1@fel.cvut.cz> wrote:\r
+\r
+> ALTERNATE_EDITOR causes emacsclient to run an alternate editor if the\r
+> emacs server is not ready. This can collide with intended\r
+> functionality in test-lib.sh.\r
+>\r
+> If the ALTERNATE_EDITOR is set but empty, emacsclient runs emacs\r
+> daemon and tries to connect to it. When this happens the emacs run by\r
+> test-lib.sh fails to start the server and the subsequent attempts to\r
+> use the server fail because the daemon started by emacsclient does not\r
+> know about notmuch-test-progn. This leads to test suite failure due to\r
+> time out on any emacs test.\r
+> ---\r
+\r
+Looks good to me -- just that should the unsetting be done in the same\r
+place as (most) other environment variables are handled... in the\r
+region starting from line 64 of that same file.\r
+\r
+Tomi\r
+\r
+\r
+>  test/test-lib.sh | 1 +\r
+>  1 file changed, 1 insertion(+)\r
+>\r
+> diff --git a/test/test-lib.sh b/test/test-lib.sh\r
+> index 126911f..0f6a6cf 100644\r
+> --- a/test/test-lib.sh\r
+> +++ b/test/test-lib.sh\r
+> @@ -1152,6 +1152,7 @@ test_emacs () {\r
+>      rm -f OUTPUT\r
+>      touch OUTPUT\r
+>  \r
+> +    unset ALTERNATE_EDITOR\r
+>      ${TEST_EMACSCLIENT} --socket-name="$EMACS_SERVER" --eval "(notmuch-test-progn $@)"\r
+>  }\r
+>  \r
+> -- \r
+> 2.6.4\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> https://notmuchmail.org/mailman/listinfo/notmuch\r