test: let the OS choose a port for smtp-dummy

This should avoid potential collisions if we start running multiple
smtp-dummy processes in parallel.

diff --git a/test/smtp-dummy.c b/test/smtp-dummy.c
index 71992edd1d968d5d0d14907ef505f0a0427f3051..a7c1fe4fe822417d8bfb9819144627b522290a6e 100644 (file)
--- 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 f5d367aae2d71c161bd45a707b851b7c1a275221..507886ba83f97eb69ecad6e6d16693ac505d7cab 100644 (file)
--- 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\")