aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/test/httpd_SUITE.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <ingela@erlang.org>2017-03-31 17:31:10 +0200
committerIngela Anderton Andin <ingela@erlang.org>2017-04-03 11:12:02 +0200
commit8ebf838c8391c5b373f82acdfa3b60245cab2de7 (patch)
treef01d6da23a85901114f466309a0359993ca476fb /lib/inets/test/httpd_SUITE.erl
parentbe2b0e6e5b4786cb6f7d56cdcdc05339aa214406 (diff)
downloadotp-8ebf838c8391c5b373f82acdfa3b60245cab2de7.tar.gz
otp-8ebf838c8391c5b373f82acdfa3b60245cab2de7.tar.bz2
otp-8ebf838c8391c5b373f82acdfa3b60245cab2de7.zip
inets: Do not test https/ftps if crypto can not start
Diffstat (limited to 'lib/inets/test/httpd_SUITE.erl')
-rw-r--r--lib/inets/test/httpd_SUITE.erl18
1 files changed, 16 insertions, 2 deletions
diff --git a/lib/inets/test/httpd_SUITE.erl b/lib/inets/test/httpd_SUITE.erl
index aae4ce5256..44b1e09cbc 100644
--- a/lib/inets/test/httpd_SUITE.erl
+++ b/lib/inets/test/httpd_SUITE.erl
@@ -197,7 +197,14 @@ init_per_group(Group, Config0) when Group == https_basic;
Group == https_security;
Group == https_reload
->
- init_ssl(Group, Config0);
+ catch crypto:stop(),
+ try crypto:start() of
+ ok ->
+ init_ssl(Group, Config0)
+ catch
+ _:_ ->
+ {skip, "Crypto did not start"}
+ end;
init_per_group(Group, Config0) when Group == http_basic;
Group == http_limit;
Group == http_custom;
@@ -232,7 +239,14 @@ init_per_group(https_htaccess = Group, Config) ->
Path = proplists:get_value(doc_root, Config),
catch remove_htaccess(Path),
create_htaccess_data(Path, proplists:get_value(address, Config)),
- init_ssl(Group, Config);
+ catch crypto:stop(),
+ try crypto:start() of
+ ok ->
+ init_ssl(Group, Config)
+ catch
+ _:_ ->
+ {skip, "Crypto did not start"}
+ end;
init_per_group(auth_api, Config) ->
[{auth_prefix, ""} | Config];
init_per_group(auth_api_dets, Config) ->