Merge branch 'maint'

erlang · Nov 18, 2013 · 58fb18b · 58fb18b
2 parents 04f5e4e + fb0006c
commit 58fb18b
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 5 deletions.
diff --git 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.

diff --git a/lib/inets/test/httpc_SUITE.erl b/lib/inets/test/httpc_SUITE.erl
@@ -145,6 +145,22 @@ init_per_group(misc = Group, Config) ->
     ok = httpc:set_options([{ipfamily, Inet}]),
     Config;
 
+init_per_group(Group, Config0) when Group =:= sim_https; Group =:= https->
+    start_apps(Group),
+    StartSsl = try ssl:start()
+    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
+    end;
+
 init_per_group(Group, Config0) ->
     start_apps(Group),
     Config = proplists:delete(port, Config0),
@@ -153,7 +169,10 @@ init_per_group(Group, Config0) ->
 
 end_per_group(_, _Config) ->
     ok.
-
+do_init_per_group(Group, Config0) ->
+    Config = proplists:delete(port, Config0),
+    Port = server_start(Group, server_config(Group, Config)),
+    [{port, Port} | Config].
 %%--------------------------------------------------------------------
 init_per_testcase(pipeline, Config) ->
     inets:start(httpc, [{profile, pipeline}]),
@@ -1069,6 +1088,8 @@ server_config(_, _) ->
 
 start_apps(https) ->
     inets_test_lib:start_apps([crypto, public_key, ssl]);
+start_apps(sim_https) ->
+    inets_test_lib:start_apps([crypto, public_key, ssl]);
 start_apps(_) ->
     ok.