aboutsummaryrefslogtreecommitdiffstats
path: root/lib/eldap/test
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-11-07 16:40:18 +0100
committerFredrik Gustafsson <[email protected]>2013-11-14 09:04:23 +0100
commitdb08571335f744b2105f214c7e2c1ecf897b5c5c (patch)
treebcd6b6caac22e8495e8496768b80d05b8d7ed267 /lib/eldap/test
parentc01df2215ac3ddef82116abac5eaf236d3788f21 (diff)
downloadotp-db08571335f744b2105f214c7e2c1ecf897b5c5c.tar.gz
otp-db08571335f744b2105f214c7e2c1ecf897b5c5c.tar.bz2
otp-db08571335f744b2105f214c7e2c1ecf897b5c5c.zip
[eldap, inets]: fix testcases when ssl not is present
Diffstat (limited to 'lib/eldap/test')
-rw-r--r--lib/eldap/test/eldap_basic_SUITE.erl17
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.