From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Tue, 30 May 2017 07:37:24 +0000 (+0300)
Subject: lib-imap-client: Fix test-imapc-client unit test to work on OSX
X-Git-Tag: 2.3.0.rc1~1527
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=be97d7e54ef50ac49f3fd4ca27f0b8660e239036;p=thirdparty%2Fdovecot%2Fcore.git

lib-imap-client: Fix test-imapc-client unit test to work on OSX

connect() to port 0 fails in it, so for the "connect failure" test first
open a random free listener port and then close it. Hopefully nothing else
reopens it in the mean time.
---

diff --git a/src/lib-imap-client/test-imapc-client.c b/src/lib-imap-client/test-imapc-client.c
index 0e66fe6120..69bd865c84 100644
--- a/src/lib-imap-client/test-imapc-client.c
+++ b/src/lib-imap-client/test-imapc-client.c
@@ -128,9 +128,10 @@ static void test_run_client_server(
 	i_zero(&server);
 	server.pid = (pid_t)-1;
 	server.fd = -1;
-	server.fd_listen = server_test == NULL ? -1 :
-		test_open_server_fd(&server.port);
+	server.fd_listen = test_open_server_fd(&server.port);
 	client_set_copy.port = server.port;
+	if (server_test == NULL)
+		i_close_fd(&server.fd_listen);
 
 	if (mkdir(client_set->temp_path_prefix, 0700) < 0 && errno != EEXIST)
 		i_fatal("mkdir(%s) failed: %m", client_set->temp_path_prefix);