1 Return-Path: <too@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 7B006429E31
\r
6 for <notmuch@notmuchmail.org>; Mon, 12 Dec 2011 14:30:46 -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 fVDWSfdkS8m3 for <notmuch@notmuchmail.org>;
\r
16 Mon, 12 Dec 2011 14:30:45 -0800 (PST)
\r
17 Received: from mail-gw3.nixu.fi (mail-gw3.nixu.fi [193.209.237.7])
\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 77ACF429E2E
\r
21 for <notmuch@notmuchmail.org>; Mon, 12 Dec 2011 14:30:45 -0800 (PST)
\r
22 Received: from pps.filterd (mail-gw3 [127.0.0.1])
\r
23 by mail-gw3.nixu.fi (8.14.4/8.14.4) with SMTP id pBCMS4bP012321;
\r
24 Tue, 13 Dec 2011 00:30:37 +0200
\r
25 Received: from taco2.nixu.fi (taco2.nixu.fi [194.197.118.31])
\r
26 by mail-gw3.nixu.fi with ESMTP id 114cs0swqm-1
\r
27 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);
\r
28 Tue, 13 Dec 2011 00:30:37 +0200
\r
29 Received: from taco2.nixu.fi (localhost [127.0.0.1])
\r
30 by taco2.nixu.fi (8.14.3/8.14.3/Debian-5+lenny1) with ESMTP id
\r
32 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT);
\r
33 Tue, 13 Dec 2011 00:30:36 +0200
\r
34 Received: (from too@localhost)
\r
35 by taco2.nixu.fi (8.14.3/8.14.3/Submit) id pBCMUaSG015204;
\r
36 Tue, 13 Dec 2011 00:30:36 +0200
\r
37 From: Tomi Ollila <tomi.ollila@iki.fi>
\r
38 To: notmuch@notmuchmail.org
\r
39 Subject: [PATCH 2/2] test/test-lib.sh: launch smtp-dummy with --background and
\r
41 Date: Tue, 13 Dec 2011 00:29:56 +0200
\r
42 Message-Id: <1323728996-15152-2-git-send-email-tomi.ollila@iki.fi>
\r
43 X-Mailer: git-send-email 1.7.7.3
\r
44 In-Reply-To: <1323728996-15152-1-git-send-email-tomi.ollila@iki.fi>
\r
45 References: <20111212161800.GO2760@mit.edu>
\r
46 <1323728996-15152-1-git-send-email-tomi.ollila@iki.fi>
\r
47 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.5.7110,
\r
48 1.0.211, 0.0.0000 definitions=2011-12-12_10:2011-12-12, 2011-12-12,
\r
49 1970-01-01 signatures=0
\r
50 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0
\r
51 ipscore=0 suspectscore=1
\r
52 phishscore=0 bulkscore=0 adultscore=0 classifier=spam adjust=0
\r
54 scancount=1 engine=6.0.2-1012030000 definitions=main-1112120243
\r
55 Cc: Tomi Ollila <tomi.ollila@iki.fi>
\r
56 X-BeenThere: notmuch@notmuchmail.org
\r
57 X-Mailman-Version: 2.1.13
\r
59 List-Id: "Use and development of the notmuch mail system."
\r
60 <notmuch.notmuchmail.org>
\r
61 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
62 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
63 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
64 List-Post: <mailto:notmuch@notmuchmail.org>
\r
65 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
66 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
67 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
68 X-List-Received-Date: Mon, 12 Dec 2011 22:30:46 -0000
\r
70 Take the new --background option of smtp-dummy to use so that it is known
\r
71 there is smtpd listener ready when it is needed. As the smtp-dummy instance
\r
72 is no longer child process of the script sending SIGKILL to it is the only
\r
73 way to make sure the instance exits when required.
\r
75 test/test-lib.sh | 12 +++++++-----
\r
76 1 files changed, 7 insertions(+), 5 deletions(-)
\r
78 diff --git a/test/test-lib.sh b/test/test-lib.sh
\r
79 index 6be93fe..a857afe 100644
\r
80 --- a/test/test-lib.sh
\r
81 +++ b/test/test-lib.sh
\r
82 @@ -382,8 +382,9 @@ emacs_deliver_message ()
\r
84 # before we can send a message, we have to prepare the FCC maildir
\r
85 mkdir -p "$MAIL_DIR"/sent/{cur,new,tmp}
\r
86 - $TEST_DIRECTORY/smtp-dummy sent_message &
\r
89 + smtp_dummy_pid=$($TEST_DIRECTORY/smtp-dummy --background sent_message) \
\r
92 "(let ((message-send-mail-function 'message-smtpmail-send-it)
\r
93 (smtpmail-smtp-server \"localhost\")
\r
94 @@ -398,9 +399,10 @@ emacs_deliver_message ()
\r
95 (insert \"${body}\")
\r
97 (message-send-and-exit))"
\r
98 - # opportunistically quit smtp-dummy in case above fails.
\r
99 - { echo QUIT > /dev/tcp/localhost/25025; } 2>/dev/null
\r
100 - wait ${smtp_dummy_pid}
\r
101 + # Cannot wait, not our child. In case message was sent properly, client
\r
102 + # waits for confirmation before exiting and resuming control here; therefore
\r
103 + # making sure that server exits by sending (KILL) signal to it is safe.
\r
104 + kill -9 ${smtp_dummy_pid}
\r
105 notmuch new >/dev/null
\r