From: David Bremner <david@tethera.net>
To: Tomi Ollila <tomi.ollila@iki.fi>,
David Bremner <david@tethera.net>,
"Rollins, Jameson" <jrollins@caltech.edu>,
Notmuch Mail <notmuch@notmuchmail.org>
Subject: [PATCH] test: let the OS choose a port for smtp-dummy
Date: Tue, 7 May 2019 07:20:49 -0300 [thread overview]
Message-ID: <20190507102049.7799-1-david@tethera.net> (raw)
In-Reply-To: <m2woj374pd.fsf@guru.guru-group.fi>
This should avoid potential collisions if we start running multiple
smtp-dummy processes in parallel.
---
test/smtp-dummy.c | 15 ++++++++++++++-
test/test-lib.sh | 2 +-
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/test/smtp-dummy.c b/test/smtp-dummy.c
index 71992edd..a7c1fe4f 100644
--- a/test/smtp-dummy.c
+++ b/test/smtp-dummy.c
@@ -129,6 +129,7 @@ main (int argc, char *argv[])
int reuse;
int background;
int ret = 0;
+ socklen_t addrlen;
progname = argv[0];
@@ -191,7 +192,7 @@ main (int argc, char *argv[])
memset (&addr, 0, sizeof (addr));
addr.sin_family = AF_INET;
- addr.sin_port = htons (25025);
+ addr.sin_port = 0;
addr.sin_addr = *(struct in_addr *) hostinfo->h_addr;
err = bind (sock, (struct sockaddr *) &addr, sizeof (addr));
if (err) {
@@ -202,6 +203,18 @@ main (int argc, char *argv[])
goto DONE;
}
+ addrlen = sizeof (addr);
+ err = getsockname (sock, (struct sockaddr *) &addr, &addrlen);
+ if (err) {
+ fprintf (stderr, "Error: getsockname() failed: %s\n",
+ strerror (errno));
+ close (sock);
+ ret = 1;
+ goto DONE;
+ }
+
+ printf ("smtp_dummy_port='%d'\n", ntohs (addr.sin_port));
+
err = listen (sock, 1);
if (err) {
fprintf (stderr, "Error: listen() failed: %s\n",
diff --git a/test/test-lib.sh b/test/test-lib.sh
index f5d367aa..507886ba 100644
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -326,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
next prev parent reply other threads:[~2019-05-07 10:21 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-04 20:57 parallelize test suite Rollins, Jameson
2019-05-04 20:57 ` [PATCH 1/3] tests: remove some redundant pre-cleanup of the corpus MAIL_DIR Rollins, Jameson
2019-05-04 20:57 ` [PATCH 2/3] tests: remove entangling corpus index optimization Rollins, Jameson
2019-05-04 20:57 ` [PATCH 3/3] tests: run all tests in parallel, if available Rollins, Jameson
2019-05-06 4:44 ` [PATCH] tests: environment variable to specify that tests should be serialized Rollins, Jameson
2019-05-06 10:32 ` [PATCH] test: add configurable port to smtp-dummy David Bremner
2019-05-06 19:39 ` Tomi Ollila
2019-05-06 20:55 ` Daniel Kahn Gillmor
2019-05-07 10:20 ` David Bremner [this message]
2019-05-07 12:38 ` [PATCH] test: let the OS choose a port for smtp-dummy Daniel Kahn Gillmor
2019-05-08 15:59 ` Tomi Ollila
2019-05-10 10:16 ` David Bremner
2019-05-06 19:15 ` [PATCH] tests: environment variable to specify that tests should be serialized Tomi Ollila
2019-05-06 20:58 ` Daniel Kahn Gillmor
2019-05-05 10:22 ` [PATCH 1/3] tests: remove some redundant pre-cleanup of the corpus MAIL_DIR Tomi Ollila
2019-05-04 21:33 ` parallelize test suite Rollins, Jameson
2019-05-04 21:39 ` Daniel Kahn Gillmor
2019-05-04 22:53 ` David Bremner
2019-05-05 15:22 ` Daniel Kahn Gillmor
2019-05-05 16:44 ` Tomi Ollila
2019-05-06 21:39 ` Daniel Kahn Gillmor
2019-05-07 10:26 ` David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190507102049.7799-1-david@tethera.net \
--to=david@tethera.net \
--cc=jrollins@caltech.edu \
--cc=notmuch@notmuchmail.org \
--cc=tomi.ollila@iki.fi \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).