From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id E3A0F6DE0EC7 for ; Mon, 6 May 2019 03:32:49 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: -0.034 X-Spam-Level: X-Spam-Status: No, score=-0.034 tagged_above=-999 required=5 tests=[AWL=-0.033, SPF_PASS=-0.001] autolearn=disabled Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Svv51KeQDSrn for ; Mon, 6 May 2019 03:32:49 -0700 (PDT) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by arlo.cworth.org (Postfix) with ESMTPS id D31DC6DE0E92 for ; Mon, 6 May 2019 03:32:48 -0700 (PDT) Received: from remotemail by fethera.tethera.net with local (Exim 4.89) (envelope-from ) id 1hNavN-0003xq-AP; Mon, 06 May 2019 06:32:45 -0400 Received: (nullmailer pid 23715 invoked by uid 1000); Mon, 06 May 2019 10:32:43 -0000 From: David Bremner To: "Rollins, Jameson" , Notmuch Mail Subject: [PATCH] test: add configurable port to smtp-dummy Date: Mon, 6 May 2019 07:32:30 -0300 Message-Id: <20190506103230.23669-1-david@tethera.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190506044406.6900-1-jrollins@caltech.edu> References: <20190506044406.6900-1-jrollins@caltech.edu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.29 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: Mon, 06 May 2019 10:32:50 -0000 This is to allow smtp-dummy to potentially be used from multiple T*.sh without collisions during parallel test running. --- test/T310-emacs.sh | 3 +++ test/smtp-dummy.c | 7 ++++++- test/test-lib.sh | 4 +++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/test/T310-emacs.sh b/test/T310-emacs.sh index c06a8133..3eab1ba9 100755 --- a/test/T310-emacs.sh +++ b/test/T310-emacs.sh @@ -5,6 +5,9 @@ test_description="emacs interface" EXPECTED=$NOTMUCH_SRCDIR/test/emacs.expected-output +# this port must be unique to each test script using smtp-dummy +export SMTP_DUMMY_PORT=25125 + add_email_corpus # syntax errors in test-lib.el cause mysterious failures diff --git a/test/smtp-dummy.c b/test/smtp-dummy.c index 71992edd..4cd66f5c 100644 --- a/test/smtp-dummy.c +++ b/test/smtp-dummy.c @@ -120,6 +120,7 @@ int main (int argc, char *argv[]) { const char *progname; + const char *port_str; char *output_filename; FILE *peer_file = NULL, *output = NULL; int sock = -1, peer, err; @@ -191,7 +192,11 @@ main (int argc, char *argv[]) memset (&addr, 0, sizeof (addr)); addr.sin_family = AF_INET; - addr.sin_port = htons (25025); + if ((port_str = getenv ("SMTP_DUMMY_PORT"))) + addr.sin_port = htons (atoi (port_str)); + else + addr.sin_port = htons (25025); + addr.sin_addr = *(struct in_addr *) hostinfo->h_addr; err = bind (sock, (struct sockaddr *) &addr, sizeof (addr)); if (err) { diff --git a/test/test-lib.sh b/test/test-lib.sh index 43339902..f3be537b 100644 --- a/test/test-lib.sh +++ b/test/test-lib.sh @@ -93,6 +93,8 @@ TEST_GDB=${TEST_GDB:-gdb} TEST_CC=${TEST_CC:-cc} TEST_CFLAGS=${TEST_CFLAGS:-"-g -O0"} +SMTP_DUMMY_PORT=${SMTP_DUMMY_PORT:-25025} + # Protect ourselves from common misconfiguration to export # CDPATH into the environment unset CDPATH @@ -324,7 +326,7 @@ emacs_deliver_message () "(let ((message-send-mail-function 'message-smtpmail-send-it) (mail-host-address \"example.com\") (smtpmail-smtp-server \"localhost\") - (smtpmail-smtp-service \"25025\")) + (smtpmail-smtp-service \"${SMTP_DUMMY_PORT}\")) (notmuch-mua-mail) (message-goto-to) (insert \"test_suite@notmuchmail.org\nDate: 01 Jan 2000 12:00:00 -0000\") -- 2.20.1