Fixed IPv6 test case selection. That is if a IPv6 test case should

be run or not.

3 files changed, 149 insertions, 73 deletions

diff --git a/lib/inets/test/httpc_SUITE.erl b/lib/inets/test/httpc_SUITE.erl
index e4cd893009..828fa54523 100644
--- a/lib/inets/test/httpc_SUITE.erl
+++ b/lib/inets/test/httpc_SUITE.erl
@@ -220,20 +220,33 @@ end_per_suite(Config) ->
 %% Note: This function is free to add any key/value pairs to the Config
 %% variable, but should NOT alter/remove any existing entries.
 %%--------------------------------------------------------------------
+
 init_per_testcase(otp_8154_1 = Case, Config) ->
     init_per_testcase(Case, 5, Config);
 
-init_per_testcase(initial_server_connect, Config) ->
+init_per_testcase(initial_server_connect = Case, Config) ->
     %% Try to check if crypto actually exist or not, 
     %% this test case does not work unless it does
-    case (catch crypto:start()) of
-	ok ->
-	    application:start(public_key),
-	    application:start(ssl),
+    try 
+	begin
+	    ensure_started(crypto),
+	    ensure_started(public_key),
+	    ensure_started(ssl),
 	    inets:start(),
-	    Config;
-	_ ->
-	    {skip,"Could not start crypto"}
+	    Config
+	end
+    catch
+	throw:{error, {failed_starting, App, ActualError}} ->
+	    tsp("init_per_testcase(~w) -> failed starting ~w: "
+		"~n   ~p", [Case, App, ActualError]),
+	    SkipString = 
+		"Could not start " ++ atom_to_list(App),
+	    {skip, SkipString};
+	  _:X ->
+	    SkipString = 
+		lists:flatten(
+		  io_lib:format("Failed starting apps: ~p", [X])), 
+	    {skip, SkipString}
     end;
 
 init_per_testcase(Case, Config) ->
@@ -274,16 +287,23 @@ init_per_testcase(Case, Timeout, Config) ->
 		    "https_not_supported" ->	
 			tsp("init_per_testcase -> [proxy case] start inets"),
 			inets:start(),
-			tsp("init_per_testcase -> [proxy case] start ssl"),
-			application:start(crypto),
-			application:start(public_key),
-			case (catch application:start(ssl)) of
+			tsp("init_per_testcase -> "
+			    "[proxy case] start crypto, public_key and ssl"),
+			try ensure_started([crypto, public_key, ssl]) of
 			    ok ->
-				[{watchdog, Dog} | TmpConfig];
-			    _ ->
-				[{skip, "SSL does not seem to be supported"} 
-				 | TmpConfig]
+				[{watchdog, Dog} | TmpConfig]
+			catch 
+			    throw:{error, {failed_starting, App, _}} ->
+				SkipString = 
+				    "Could not start " ++ atom_to_list(App),
+				{skip, SkipString};
+			    _:X ->
+				SkipString = 
+				    lists:flatten(
+				      io_lib:format("Failed starting apps: ~p", [X])), 
+				{skip, SkipString}
 			end;
+
 		    _ ->
 			%% We use erlang.org for the proxy tests 
 			%% and after the switch to erlang-web, many
@@ -322,24 +342,31 @@ init_per_testcase(Case, Timeout, Config) ->
 		end;
 
 	    "ipv6_" ++ _Rest ->
-		%% Start httpc part of inets
-		CryptoStartRes = application:start(crypto),
-		PubKeyStartRes = application:start(public_key),
-		SSLStartRes    = application:start(ssl),
-		tsp("App start result: "
-		    "~n   Crypto    start result: ~p"
-		    "~n   PublicKey start result: ~p"
-		    "~n   SSL       start result: ~p", 
-		    [CryptoStartRes, PubKeyStartRes, SSLStartRes]),
-		Profile = ipv6, 
-		%% A stand-alone profile is represented by a pid()
-		{ok, ProfilePid} = 
-		    inets:start(httpc, 
-				[{profile,  Profile}, 
-				 {data_dir, PrivDir}], stand_alone),
-		httpc:set_options([{ipfamily, inet6}], ProfilePid), 
-		tsp("httpc profile pid: ~p", [ProfilePid]),
-		[{watchdog, Dog}, {profile, ProfilePid}| TmpConfig];
+		%% Ensure needed apps (crypto, public_key and ssl) started
+		try ensure_started([crypto, public_key, ssl]) of
+		    ok ->
+			Profile = ipv6, 
+			%% A stand-alone profile is represented by a pid()
+			{ok, ProfilePid} = 
+			    inets:start(httpc, 
+					[{profile,  Profile}, 
+					 {data_dir, PrivDir}], stand_alone),
+			httpc:set_options([{ipfamily, inet6}], ProfilePid), 
+			tsp("httpc profile pid: ~p", [ProfilePid]),
+			[{watchdog, Dog}, {profile, ProfilePid}| TmpConfig]
+		catch 
+		    throw:{error, {failed_starting, App, ActualError}} ->
+			tsp("init_per_testcase(~w) -> failed starting ~w: "
+			    "~n   ~p", [Case, App, ActualError]),
+			SkipString = 
+			    "Could not start " ++ atom_to_list(App),
+			{skip, SkipString};
+		      _:X ->
+			SkipString = 
+			    lists:flatten(
+			      io_lib:format("Failed starting apps: ~p", [X])), 
+			{skip, SkipString}
+		end;
 	    _ -> 
 		TmpConfig2 = lists:keydelete(local_server, 1, TmpConfig),
 		Server = 
@@ -1926,7 +1953,7 @@ parse_url(Config) when is_list(Config) ->
 %%-------------------------------------------------------------------------
 
 ipv6_ipcomm() ->
-    [].
+    [{require, ipv6_hosts}].
 ipv6_ipcomm(doc) ->
     ["Test ip_comm ipv6."];
 ipv6_ipcomm(suite) ->
@@ -1942,7 +1969,7 @@ ipv6_ipcomm(Config) when is_list(Config) ->
 %%-------------------------------------------------------------------------
 
 ipv6_essl() ->
-    [].
+    [{require, ipv6_hosts}].
 ipv6_essl(doc) ->
     ["Test essl ipv6."];
 ipv6_essl(suite) ->
@@ -1966,7 +1993,7 @@ ipv6_essl(Config) when is_list(Config) ->
 ipv6(SocketType, Scheme, HTTPOptions, Extra, Config) ->
     %% Check if we are a IPv6 host
     tsp("ipv6 -> verify ipv6 support", []),
-    case inets_test_lib:has_ipv6_support() of
+    case inets_test_lib:has_ipv6_support(Config) of
 	{ok, Addr} ->
 	    tsp("ipv6 -> ipv6 supported: ~p", [Addr]),
 	    {DummyServerPid, Port} = dummy_server(SocketType, ipv6, Extra),
@@ -3526,3 +3553,19 @@ dummy_ssl_server_hang_loop(_) ->
 	    ok
     end.
 
+
+ensure_started([]) ->
+    ok;
+ensure_started([App|Apps]) ->
+    ensure_started(App),
+    ensure_started(Apps);
+ensure_started(App) when is_atom(App) ->
+    case (catch application:start(App)) of
+	ok ->
+	    ok;
+	{error, {already_started, _}} ->
+	    ok;
+	Error ->
+	    throw({error, {failed_starting, App, Error}})
+    end.
+
diff --git a/lib/inets/test/httpd_SUITE.erl b/lib/inets/test/httpd_SUITE.erl
index 72b80a9f80..c4d4bf969b 100644
--- a/lib/inets/test/httpd_SUITE.erl
+++ b/lib/inets/test/httpd_SUITE.erl
@@ -208,8 +208,10 @@
 	 ticket_7304/1]).
 
 %%% IPv6 tests
--export([ipv6_hostname_ipcomm/1, ipv6_address_ipcomm/1,
-	 ipv6_hostname_essl/1,   ipv6_address_essl/1]).
+-export([ipv6_hostname_ipcomm/0, ipv6_hostname_ipcomm/1, 
+	 ipv6_address_ipcomm/0,  ipv6_address_ipcomm/1, 
+	 ipv6_hostname_essl/0,   ipv6_hostname_essl/1,   
+	 ipv6_address_essl/0,    ipv6_address_essl/1]).
 
 %% Help functions 
 -export([cleanup_mnesia/0, setup_mnesia/0, setup_mnesia/1]).
@@ -515,7 +517,7 @@ init_per_testcase2(Case, Config) ->
     NewConfig2 = 
 	case atom_to_list(Case) of
 	    "ipv6_" ++ _ ->
-		case (catch inets_test_lib:has_ipv6_support()) of
+		case (catch inets_test_lib:has_ipv6_support(NewConfig)) of
 		    {ok, IPv6Address0} ->
 			{ok, Hostname} = inet:gethostname(), 
 			IPv6Address = http_transport:ipv6_name(IPv6Address0), 
@@ -551,18 +553,6 @@ init_per_testcase2(Case, Config) ->
 		NewConfig
 	end,
 
-    %% case (catch ?config(test_host_ipv6_only, Config)) of
-    %% 	{_,IPv6Host,IPv6Adress,_,_} ->
-    %% 	    create_ipv6_config([{port, ?IP_PORT}, 
-    %% 				{sock_type, ip_comm} | NewConfig],
-    %% 			       "ipv6_hostname.conf", IPv6Host),
-    %% 	    create_ipv6_config([{port, ?IP_PORT}, 
-    %% 				{sock_type, ip_comm} | NewConfig],
-    %% 			       "ipv6_address.conf", IPv6Adress);
-    %% 	_ ->
-    %% 	    ok
-    %%     end,
-    
     io:format(user, "~w:init_per_testcase2(~w) -> done~n", 
 	      [?MODULE, Case]),
 
@@ -2456,11 +2446,16 @@ ip_mod_cgi_chunked_encoding_test(Config) when is_list(Config) ->
     ok.
 
 %------------------------------------------------------------------------- 
+
+ipv6_hostname_ipcomm() ->
+    [{require, ipv6_hosts}].
 ipv6_hostname_ipcomm(X) -> 
     SocketType = ip_comm,
     Port       = ?IP_PORT, 
     ipv6_hostname(SocketType, Port, X).
 
+ipv6_hostname_essl() ->
+    [{require, ipv6_hosts}].
 ipv6_hostname_essl(X) -> 
     SocketType = essl, 
     Port       = ?SSL_PORT, 
@@ -2487,11 +2482,15 @@ ipv6_hostname(SocketType, Port, Config) when is_list(Config) ->
 
 %%------------------------------------------------------------------------- 
 
+ipv6_address_ipcomm() ->
+    [{require, ipv6_hosts}].
 ipv6_address_ipcomm(X) ->
     SocketType = ip_comm,
     Port       = ?IP_PORT, 
     ipv6_address(SocketType, Port, X).
 
+ipv6_address_essl() ->
+    [{require, ipv6_hosts}].
 ipv6_address_essl(X) ->
     SocketType = essl,
     Port       = ?SSL_PORT, 
@@ -3060,27 +3059,27 @@ create_ipv6_config(Config, FileName, Ipv6Address) ->
 
     BindAddress = "[" ++ Ipv6Address ++"]|inet6", 
 
-    HttpConfig = [cline(["BindAddress ", BindAddress]),
-		  cline(["Port ", integer_to_list(Port)]),
-		  cline(["ServerName ", Host]),
-		  cline(["SocketType ", atom_to_list(SockType)]),
-		  cline([Mod_order]),
-		  cline(["ServerRoot ", ServerRoot]),
-		  cline(["DocumentRoot ",  
-			 filename:join(ServerRoot, "htdocs")]),
-		  cline(["MaxHeaderSize ",MaxHdrSz]),
-		  cline(["MaxHeaderAction ",MaxHdrAct]),
-		  cline(["DirectoryIndex ", "index.html "]),
-		  cline(["DefaultType ", "text/plain"]), 
-		  SSL],
+    HttpConfig = 
+	[cline(["BindAddress ", BindAddress]),
+	 cline(["Port ", integer_to_list(Port)]),
+	 cline(["ServerName ", Host]),
+	 cline(["SocketType ", atom_to_list(SockType)]),
+	 cline([Mod_order]),
+	 cline(["ServerRoot ", ServerRoot]),
+	 cline(["DocumentRoot ", filename:join(ServerRoot, "htdocs")]),
+	 cline(["MaxHeaderSize ",MaxHdrSz]),
+	 cline(["MaxHeaderAction ",MaxHdrAct]),
+	 cline(["DirectoryIndex ", "index.html "]),
+	 cline(["DefaultType ", "text/plain"]), 
+	 SSL],
     ConfigFile = filename:join([TcTopDir,FileName]),
     {ok, Fd} = file:open(ConfigFile, [write]),
     ok = file:write(Fd, lists:flatten(HttpConfig)),
     ok = file:close(Fd).
 
 
-tsp(F) ->
-    inets_test_lib:tsp(F).
+%% tsp(F) ->
+%%     inets_test_lib:tsp(F).
 tsp(F, A) ->
     inets_test_lib:tsp(F, A).
 
diff --git a/lib/inets/test/inets_test_lib.erl b/lib/inets/test/inets_test_lib.erl
index 60164c5a72..0c3422b529 100644
--- a/lib/inets/test/inets_test_lib.erl
+++ b/lib/inets/test/inets_test_lib.erl
@@ -34,20 +34,54 @@
 -export([tsp/1, tsp/2, tsf/1]).
 -export([check_body/1]).
 -export([millis/0, millis_diff/2, hours/1, minutes/1, seconds/1, sleep/1]).
--export([oscmd/1, has_ipv6_support/0]).
+-export([oscmd/1, has_ipv6_support/1]).
 -export([non_pc_tc_maybe_skip/4, os_based_skip/1, skip/3, fail/3]).
 -export([flush/0]).
 -export([start_node/1, stop_node/1]).
 
 %% -- Misc os command and stuff
 
-has_ipv6_support() ->
-    {ok, Hostname} = inet:gethostname(),
-    case inet:getaddrs(Hostname, inet6) of
-	{ok, [Addr|_]} ->
-	    {ok, Addr};
+has_ipv6_support(Config) ->
+    case lists:keysearch(ipv6_hosts, Config) of
+	false ->
+	    %% Do a basic check to se if 
+	    %% our own host has a working IPv6 address...
+	    tsp("has_ipv6_support -> no ipv6_hosts config"),
+	    {ok, Hostname} = inet:gethostname(),
+	    case inet:getaddrs(Hostname, inet6) of
+		{ok, [Addr|_]} when is_tuple(Addr) andalso 
+				    (element(1, Addr) =/= 0) ->
+		    %% We actually need to test that the addr can be used, 
+		    %% this is done by attempting to create a (tcp) 
+		    %% listen socket
+		    tsp("has_ipv6_support -> check Addr: ~p", [Addr]),
+		    case (catch gen_tcp:listen(0, [inet6, {ip, Addr}])) of
+			{ok, LSock} ->
+			    tsp("has_ipv6_support -> we are ipv6 host"),
+			    gen_tcp:close(LSock),
+			    {ok, Addr};
+			_ ->
+			    undefined
+		    end;
+		_ ->
+		    undefined
+	    end;
+	{value, {_, Hosts}} when is_list(Hosts) ->
+	    %% Check if our host is in the list of *known* IPv6 hosts
+	    tsp("has_ipv6_support -> Hosts: ~p", [Hosts]),
+	    {ok, Hostname} = inet:gethostname(),
+	    case lists:member(list_to_atom(Hostname), Hosts) of
+		true ->
+		    tsp("has_ipv6_support -> we are known ipv6 host"),
+		    {ok, [Addr|_]} = inet:getaddrs(Hostname, inet6),
+		    {ok, Addr};
+		false ->
+		    undefined
+	    end;
+	
 	_ ->
 	    undefined
+
     end.
 
 oscmd(Cmd) ->