diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-11-18 10:22:28 +0100 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-11-18 10:22:28 +0100 |
| commit | fb0006c937e284cefe5217d4c2a4b45ff7dfb758 (patch) | |
| tree | 45f98a4f6675f83789b60a86c56a62955dc9d6e2 /lib/eldap | |
| parent | b2e4599affa6718bba60ef3846d130513e9a740d (diff) | |
| parent | db08571335f744b2105f214c7e2c1ecf897b5c5c (diff) | |
| download | otp-fb0006c937e284cefe5217d4c2a4b45ff7dfb758.tar.gz otp-fb0006c937e284cefe5217d4c2a4b45ff7dfb758.tar.bz2 otp-fb0006c937e284cefe5217d4c2a4b45ff7dfb758.zip | |
Merge branch 'fredrik/fix_tests_ssl_not_present/OTP-11474' into maint
* fredrik/fix_tests_ssl_not_present/OTP-11474:
[eldap, inets]: fix testcases when ssl not is present
Diffstat (limited to 'lib/eldap')
| -rw-r--r-- | lib/eldap/test/eldap_basic_SUITE.erl | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/lib/eldap/test/eldap_basic_SUITE.erl b/lib/eldap/test/eldap_basic_SUITE.erl index 127d753b92..bf5fa83c3c 100644 --- a/lib/eldap/test/eldap_basic_SUITE.erl +++ b/lib/eldap/test/eldap_basic_SUITE.erl @@ -28,10 +28,19 @@ -define(TIMEOUT, 120000). % 2 min init_per_suite(Config) -> - ssl:start(), - chk_config(ldap_server, {"localhost",9876}, - chk_config(ldaps_server, {"localhost",9877}, - Config)). + StartSsl = try ssl:start() + catch + Error:Reason -> + {skip, lists:flatten(io_lib:format("eldap init_per_suite failed to start ssl Error=~p Reason=~p", [Error, Reason]))} + end, + case StartSsl of + ok -> + chk_config(ldap_server, {"localhost",9876}, + chk_config(ldaps_server, {"localhost",9877}, + Config)); + _ -> + StartSsl + end. end_per_suite(_Config) -> ok. |