diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-03-31 17:31:10 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-04-03 11:12:02 +0200 |
| commit | 8ebf838c8391c5b373f82acdfa3b60245cab2de7 (patch) | |
| tree | f01d6da23a85901114f466309a0359993ca476fb /lib/inets/test/httpc_SUITE.erl | |
| parent | be2b0e6e5b4786cb6f7d56cdcdc05339aa214406 (diff) | |
| download | otp-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/httpc_SUITE.erl')
| -rw-r--r-- | lib/inets/test/httpc_SUITE.erl | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/lib/inets/test/httpc_SUITE.erl b/lib/inets/test/httpc_SUITE.erl index 8aea38037d..67aa78aa06 100644 --- a/lib/inets/test/httpc_SUITE.erl +++ b/lib/inets/test/httpc_SUITE.erl @@ -163,21 +163,17 @@ init_per_group(misc = Group, Config) -> ok = httpc:set_options([{ipfamily, Inet}]), Config; + init_per_group(Group, Config0) when Group =:= sim_https; Group =:= https-> - ct:timetrap({seconds, 30}), - start_apps(Group), - StartSsl = try ssl:start() + catch crypto:stop(), + try crypto:start() of + ok -> + ct:timetrap({seconds, 30}), + start_apps(Group), + do_init_per_group(Group, Config0) catch - Error:Reason -> - {skip, lists:flatten(io_lib:format("Failed to start apps for https Error=~p Reason=~p", [Error, Reason]))} - end, - case StartSsl of - {error, {already_started, _}} -> - do_init_per_group(Group, Config0); - ok -> - do_init_per_group(Group, Config0); - _ -> - StartSsl + _:_ -> + {skip, "Crypto did not start"} end; init_per_group(Group, Config0) -> |