File 1380-eldap-Update-list-of-ldap-servers.patch of Package erlang
From 6cf39a00e43ae9b2f14be0969cacf1d6e9fa205e Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Tue, 25 Jan 2022 13:17:40 +0100
Subject: [PATCH 1/2] eldap: Update list of ldap-servers
---
lib/eldap/test/eldap_basic_SUITE.erl | 21 ++++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/lib/eldap/test/eldap_basic_SUITE.erl b/lib/eldap/test/eldap_basic_SUITE.erl
index 6d90158050..9070f9e756 100644
--- a/lib/eldap/test/eldap_basic_SUITE.erl
+++ b/lib/eldap/test/eldap_basic_SUITE.erl
@@ -161,19 +161,25 @@ connection_tests() ->
].
+ldap_servers(_Config) ->
+ ["ulrad",
+ "orome",
+ "ecthelion",
+ "bifur"
+ ].
+
init_per_suite(Config) ->
SSL_available = init_ssl_certs_et_al(Config),
- LDAP_server = find_first_server(false, [{config,eldap_server},
- {config,ldap_server},
- {"localhost",9876},
- {"aramis.otp.ericsson.se",9876}]),
+ ServerHosts = ["localhost" | ldap_servers(Config)],
+ LDAP_server = find_first_server(false,
+ [{H,9876} || H <- ServerHosts]),
+
LDAPS_server =
case SSL_available of
true ->
- find_first_server(true, [{config,ldaps_server},
- {"localhost",9877},
- {"aramis.otp.ericsson.se",9877}]);
+ find_first_server(true,
+ [{H,9877} || H <- ServerHosts]);
false ->
undefined
end,
@@ -1233,3 +1239,4 @@ init_ssl_certs_et_al(Config) ->
ct:log("init_per_suite failed to start ssl Error=~p Reason=~p", [Error, Reason]),
false
end.
+
--
2.34.1