1 Return-Path: <tomi.ollila@nixu.com>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 16F98431FD0
\r
6 for <notmuch@notmuchmail.org>; Thu, 10 Nov 2011 15:38:56 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id OMejMa1ruWCd for <notmuch@notmuchmail.org>;
\r
16 Thu, 10 Nov 2011 15:38:55 -0800 (PST)
\r
17 Received: from taco2.nixu.fi (taco2.nixu.fi [194.197.118.31])
\r
18 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id 1ED4B431FB6
\r
21 for <notmuch@notmuchmail.org>; Thu, 10 Nov 2011 15:38:54 -0800 (PST)
\r
22 Received: from taco2.nixu.fi (taco2.nixu.fi [194.197.118.31])
\r
23 by taco2.nixu.fi (8.14.3/8.14.3/Debian-5+lenny1) with ESMTP id
\r
25 for <notmuch@notmuchmail.org>; Fri, 11 Nov 2011 01:38:53 +0200
\r
26 From: Tomi Ollila <tomi.ollila@iki.fi>
\r
27 To: <notmuch@notmuchmail.org>
\r
28 Subject: [PATCH] test: attempt to send QUIT to smtp-dummy in case mail send
\r
30 User-Agent: Notmuch/0.9+23~g556c5fa (http://notmuchmail.org) Emacs/23.3.1
\r
32 X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL
\r
33 $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F
\r
34 !)g;OY^,BjTbr)Np:%c_o'jj,Z
\r
35 Date: Fri, 11 Nov 2011 01:38:53 +0200
\r
36 Message-ID: <yf6ipmr7dki.fsf@taco2.nixu.fi>
\r
38 Content-Type: text/plain; charset=us-ascii
\r
39 X-BeenThere: notmuch@notmuchmail.org
\r
40 X-Mailman-Version: 2.1.13
\r
42 List-Id: "Use and development of the notmuch mail system."
\r
43 <notmuch.notmuchmail.org>
\r
44 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
45 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
46 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
47 List-Post: <mailto:notmuch@notmuchmail.org>
\r
48 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
49 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
50 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
51 X-List-Received-Date: Thu, 10 Nov 2011 23:38:56 -0000
\r
53 If mail sending from emacs fails before it has chance to connect
\r
54 to the smtp-dummy mail server, the opportunistic QUIT message
\r
55 sending makes smtp-dummy to exit.
\r
57 test/test-lib.sh | 8 +++++---
\r
58 1 files changed, 5 insertions(+), 3 deletions(-)
\r
60 diff --git a/test/test-lib.sh b/test/test-lib.sh
\r
61 index af723ad..57cb088 100755
\r
62 @@ -397,6 +397,8 @@ emacs_deliver_message ()
\r
63 (insert \"${body}\")
\r
65 (message-send-and-exit))" >/dev/null 2>&1
\r
66 + # opportunistically quit smtp-dummy in case above fails.
\r
67 + echo QUIT | nc 127.0.0.1 25025 >/dev/null 2>&1
\r
68 wait ${smtp_dummy_pid}
\r
69 notmuch new >/dev/null
\r