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 16F98431FD0 for ; Thu, 10 Nov 2011 15:38:56 -0800 (PST) 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 OMejMa1ruWCd for ; Thu, 10 Nov 2011 15:38:55 -0800 (PST) Received: from taco2.nixu.fi (taco2.nixu.fi [194.197.118.31]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 1ED4B431FB6 for ; Thu, 10 Nov 2011 15:38:54 -0800 (PST) Received: from taco2.nixu.fi (taco2.nixu.fi [194.197.118.31]) by taco2.nixu.fi (8.14.3/8.14.3/Debian-5+lenny1) with ESMTP id pAANcrD7019644 for ; Fri, 11 Nov 2011 01:38:53 +0200 From: Tomi Ollila To: Subject: [PATCH] test: attempt to send QUIT to smtp-dummy in case mail send failed User-Agent: Notmuch/0.9+23~g556c5fa (http://notmuchmail.org) Emacs/23.3.1 (i686-pc-linux-gnu) X-Face: HhBM'cA~ MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii 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: Thu, 10 Nov 2011 23:38:56 -0000 If mail sending from emacs fails before it has chance to connect to the smtp-dummy mail server, the opportunistic QUIT message sending makes smtp-dummy to exit. --- test/test-lib.sh | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/test/test-lib.sh b/test/test-lib.sh index af723ad..57cb088 100755 @@ -397,6 +397,8 @@ emacs_deliver_message () (insert \"${body}\") $@ (message-send-and-exit))" >/dev/null 2>&1 + # opportunistically quit smtp-dummy in case above fails. + echo QUIT | nc 127.0.0.1 25025 >/dev/null 2>&1 wait ${smtp_dummy_pid} notmuch new >/dev/null } -- 1.5.6.5