aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2017-06-07 13:12:58 +0200
committerHans Nilsson <[email protected]>2017-06-07 13:12:58 +0200
commit1ee59088c52ff18e3917d7f453a5947d0fe1cadd (patch)
treea5f5617c6ea67be8d1ef3ec2d2c1bf4e28b8a34f
parentf66bca0ad272dbed8ec0b3b1b35d182cf65f7a1d (diff)
parent41204092e8ded7b3444e121af405f93241783bf4 (diff)
downloadotp-1ee59088c52ff18e3917d7f453a5947d0fe1cadd.tar.gz
otp-1ee59088c52ff18e3917d7f453a5947d0fe1cadd.tar.bz2
otp-1ee59088c52ff18e3917d7f453a5947d0fe1cadd.zip
Merge branch 'hans/eldap/cuddle_tests'
-rw-r--r--lib/eldap/test/eldap_basic_SUITE.erl5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/eldap/test/eldap_basic_SUITE.erl b/lib/eldap/test/eldap_basic_SUITE.erl
index ac3447cfe6..4bfb0dd291 100644
--- a/lib/eldap/test/eldap_basic_SUITE.erl
+++ b/lib/eldap/test/eldap_basic_SUITE.erl
@@ -119,7 +119,10 @@ init_per_suite(Config) ->
{ldaps_server, LDAPS_server} | Config].
end_per_suite(_Config) ->
- ssl:stop().
+ try ssl:stop()
+ catch
+ _:_ -> ok
+ end.
init_per_group(return_values, Config) ->