aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2013-12-05 09:36:36 +0100
committerIngela Anderton Andin <[email protected]>2013-12-05 09:36:36 +0100
commitce6d89faa684f39fbd17dfb10b4f95a221b8ac9a (patch)
treeb6faf085e4b5c5c5450ee1a8e18d9292d3422f9a /lib/inets
parentcf9a0698142d03e5c32711926e81da4fba718b5a (diff)
parent272e306803e5547f46848e288219247bf0a24849 (diff)
downloadotp-ce6d89faa684f39fbd17dfb10b4f95a221b8ac9a.tar.gz
otp-ce6d89faa684f39fbd17dfb10b4f95a221b8ac9a.tar.bz2
otp-ce6d89faa684f39fbd17dfb10b4f95a221b8ac9a.zip
Merge branch 'ia/inets/cuddle-with-tests' into maint
* ia/inets/cuddle-with-tests: inets: Add crypto start check to ssl test cases
Diffstat (limited to 'lib/inets')
-rw-r--r--lib/inets/test/httpd_SUITE.erl9
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/inets/test/httpd_SUITE.erl b/lib/inets/test/httpd_SUITE.erl
index 5dca76b76b..ef801f91c7 100644
--- a/lib/inets/test/httpd_SUITE.erl
+++ b/lib/inets/test/httpd_SUITE.erl
@@ -222,6 +222,15 @@ init_per_group(ipv6 = _GroupName, Config) ->
_ ->
{skip, "Host does not support IPv6"}
end;
+init_per_group(essl, Config) ->
+ catch crypto:stop(),
+ case (catch crypto:start()) of
+ ok ->
+ Config;
+ _ ->
+ {skip, "Crypto not startable"}
+ end;
+
init_per_group(_GroupName, Config) ->
Config.