Merge branch 'maint'

1 files changed, 206 insertions, 79 deletions

diff --git a/lib/inets/test/inets_test_lib.erl b/lib/inets/test/inets_test_lib.erl
index bbed35e1f8..c94be796cd 100644
--- a/lib/inets/test/inets_test_lib.erl
+++ b/lib/inets/test/inets_test_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2001-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -31,42 +31,48 @@
 	 send/3, close/2]).
 -export([copy_file/3, copy_files/2, copy_dirs/2, del_dirs/1]).
 -export([info/4, log/4, debug/4, print/4]).
--export([tsp/1, tsp/2, tsf/1]).
+-export([tsp/1, tsp/2, tsf/1, tss/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/1]).
+-export([oscmd/1, has_ipv6_support/0, has_ipv6_support/1, print_system_info/1]).
+-export([run_on_os/2, run_on_windows/1]).
 -export([ensure_started/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() ->
+    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.
+    
 has_ipv6_support(Config) ->
     case lists:keysearch(ipv6_hosts, 1, 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;
+	    has_ipv6_support();
+
 	{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]),
@@ -88,6 +94,49 @@ has_ipv6_support(Config) ->
 oscmd(Cmd) ->
   string:strip(os:cmd(Cmd), right, $\n).
 
+
+print_system_info([]) ->
+    do_print_system_info("System Info");
+print_system_info(Prefix) when is_list(Prefix) ->
+    NewPrefix = lists:flatten(io_lib:format("~s: System Info", [Prefix])), 
+    do_print_system_info(NewPrefix).
+
+do_print_system_info(Prefix) ->
+    tsp("~s => "
+	"~n"
+	"~n   OS Type:            ~p"
+	"~n   OS version:         ~p"
+	"~n   Sys Arch:           ~p"
+	"~n   CPU Topology:       ~p"
+	"~n   Num logical procs:  ~p"
+	"~n   SMP support:        ~p"
+	"~n   Num schedulers:     ~p"
+	"~n   Scheduler bindings: ~p"
+	"~n   Wordsize:           ~p"
+	"~n~n", [Prefix, 
+		 os:type(), os:version(), 
+		 erlang:system_info(system_architecture),
+		 erlang:system_info(cpu_topology),
+		 erlang:system_info(logical_processors),
+		 erlang:system_info(smp_support),
+		 erlang:system_info(schedulers),
+		 erlang:system_info(scheduler_bindings),
+		 erlang:system_info(wordsize)]),
+    ok.
+    
+    
+run_on_windows(Fun) ->
+    run_on_os(windows, Fun).
+
+run_on_os(windows, Fun) ->
+    case os:type() of
+	{win32, _} ->
+	    Fun();
+	_ ->
+	    ok
+    end.
+	    
+    
 %% -- Misc node operation wrapper functions --
 
 start_node(Name) ->
@@ -156,6 +205,17 @@ do_ensure_started(App, Start) when is_function(Start) ->
     end.
 
 
+ensure_loaded(App) ->
+    case application:load(App) of
+	ok ->
+	    ok;
+	{error, {already_loaded,inets}} ->
+	    ok;
+	Error ->
+	    Error
+    end.
+
+
 
 %% ----------------------------------------------------------------
 %% HTTPD starter functions
@@ -165,8 +225,9 @@ start_http_server(Conf) ->
     start_http_server(Conf, ?HTTP_DEFAULT_SSL_KIND).
 
 start_http_server(Conf, essl = _SslTag) ->
-    tsp("start_http_server(essl) -> entry - try start crypto and public_key"),
+    tsp("start_http_server(essl) -> try start crypto"),
     application:start(crypto), 
+    tsp("start_http_server(essl) -> try start public_key"),
     application:start(public_key), 
     do_start_http_server(Conf);
 start_http_server(Conf, SslTag) ->
@@ -177,23 +238,32 @@ do_start_http_server(Conf) ->
     tsp("do_start_http_server -> entry with"
 	"~n   Conf: ~p"
 	"~n", [Conf]),
-    application:load(inets), 
-    case application:set_env(inets, services, [{httpd, Conf}]) of
+    tsp("do_start_http_server -> load inets"),
+    case ensure_loaded(inets) of
 	ok ->
-	    tsp("start_http_server -> httpd conf stored in inets app env"),
-	    case application:start(inets) of
+	    tsp("do_start_http_server -> inets loaded - now set_env for httpd"),
+	    case application:set_env(inets, services, [{httpd, Conf}]) of
 		ok ->
-		    tsp("start_http_server -> inets started"),
-		    ok;
-		Error1 ->
-		    tsp("<ERROR> Failed starting application: "
-			"~n   Error1: ~p", [Error1]),
-		    Error1
+		    tsp("do_start_http_server -> "
+			"httpd conf stored in inets app env"),
+		    case (catch application:start(inets)) of
+			ok ->
+			    tsp("do_start_http_server -> inets started"),
+			    ok;
+			Error1 ->
+			    tsp("<ERROR> Failed starting application: "
+				"~n   Error1: ~p", [Error1]),
+			    tsf({failed_starting_inets, Error1})
+		    end;
+		Error2 ->
+		    tsp("<ERROR> Failed set application env: "
+			"~n   Error: ~p", [Error2]),
+		    tsf({failed_set_env, Error2})
 	    end;
-	Error2 ->
-	    tsp("<ERROR> Failed set application env: "
-		"~n   Error: ~p", [Error2]),
-	    Error2
+	{error, Reason} ->
+	    tsp("do_start_http_server -> failed loading inets"
+		"~n   Reason: ~p", [Reason]),
+	    tsf({failed_loading_inets, Reason})
     end.
 	    
 start_http_server_ssl(FileName) ->
@@ -213,6 +283,7 @@ do_start_http_server_ssl(FileName) ->
     catch do_start_http_server(FileName).
 
 
+
 %% ----------------------------------------------------------------------
 %% print functions
 %%
@@ -257,20 +328,49 @@ copy_files(FromDir, ToDir) ->
 
 
 copy_dirs(FromDirRoot, ToDirRoot) ->
-    {ok, Files} = file:list_dir(FromDirRoot),
-    lists:foreach(
-      fun(FileOrDir) -> 
-	      %% Check if it's a directory or a file
-	      case filelib:is_dir(filename:join(FromDirRoot, FileOrDir)) of
-		  true ->
-		      FromDir = filename:join([FromDirRoot, FileOrDir]),
-		      ToDir   = filename:join([ToDirRoot, FileOrDir]),
-		      ok      = file:make_dir(ToDir),
-		      copy_dirs(FromDir, ToDir);
-		  false ->
-		      copy_file(FileOrDir, FromDirRoot, ToDirRoot)
-	      end
-      end, Files).
+    case file:list_dir(FromDirRoot) of
+	{ok, Files}  ->
+	    lists:foreach(
+	      fun(FileOrDir) -> 
+		      %% Check if it's a directory or a file
+		      case filelib:is_dir(filename:join(FromDirRoot, 
+							FileOrDir)) of
+			  true ->
+			      FromDir = filename:join([FromDirRoot, FileOrDir]),
+			      ToDir   = filename:join([ToDirRoot, FileOrDir]),
+			      case file:make_dir(ToDir) of
+				  ok ->
+				      copy_dirs(FromDir, ToDir);
+				  {error, Reason} ->
+				      tsp("<ERROR> Failed creating directory: "
+					  "~n   ToDir:  ~p"
+					  "~n   Reason: ~p"
+					  "~nwhen"
+					  "~n   ToDirRoot:           ~p"
+					  "~n   ToDirRoot file info: ~p", 
+					  [ToDir, 
+					   Reason, 
+					   ToDirRoot, 
+					   file:read_file_info(ToDirRoot)]),
+				      tsf({failed_copy_dir, ToDir, Reason})
+			      end;
+			  false ->
+			      copy_file(FileOrDir, FromDirRoot, ToDirRoot)
+		      end
+	      end, Files);
+	{error, Reason} ->
+	    tsp("<ERROR> Failed get directory file list: "
+		"~n   FromDirRoot: ~p"
+		"~n   Reason:      ~p"
+		"~nwhen"
+		"~n   FromDirRoot file info: ~p", 
+		[FromDirRoot, 
+		 Reason, 
+		 file:read_file_info(FromDirRoot)]),
+	    tsf({failed_list_dir, FromDirRoot, Reason})
+    end.
+	    
+		
 
 del_dirs(Dir) ->
     case file:list_dir(Dir) of
@@ -394,56 +494,80 @@ connect_byte(ip_comm, Host, Port, Opts0) ->
     connect(ip_comm, Host, Port, Opts).
 
 
-connect(ssl, Host, Port, Opts) ->
+%% This always falls back on IPV4, but tries IPV6 first.
+connect(Proto, Host, Port, Opts0) ->
+    Opts = Opts0 -- [inet, inet6],
+    connect(Proto, Host, Port, Opts ++ [inet6], inet6).
+
+connect(ssl, Host, Port, Opts, Type) ->
     tsp("connect(ssl) -> entry with"
 	"~n   Host: ~p"
 	"~n   Port: ~p"
-	"~n   Opts: ~p", [Host, Port, Opts]),
+	"~n   Opts: ~p"
+	"~n   Type: ~p", [Host, Port, Opts, Type]),
     ssl:start(),
-    %% Does not support ipv6 in old ssl 
+    %% We ignore this option for ssl... 
+    %% ...maybe we should really treat this in the same way as ip_comm...
     case ssl:connect(Host, Port, Opts) of
 	{ok, Socket} ->
 	    {ok, Socket};
+	{error, Reason} when Type =:= inet6 ->
+	    tsp("connect(ssl) -> failed connecting with inet6: "
+		"~n   Reason: ~p"
+		"~n   trying inet", [Reason]),
+	    connect(ssl, Host, Port, Opts -- [inet6], inet);
 	{error, Reason} ->
-	    {error, Reason};
+	    tsp("connect(ssl) -> failed connecting: "
+		"~n   Reason: ~p", [Reason]),
+ 	    {error, Reason};
 	Error ->
 	    Error
     end;
-connect(ip_comm, Host, Port, Opts) ->
+connect(ip_comm, Host, Port, Opts, Type) ->
     tsp("connect(ip_comm) -> entry with"
 	"~n   Host: ~p"
 	"~n   Port: ~p"
-	"~n   Opts: ~p", [Host, Port, Opts]),
-    case gen_tcp:connect(Host,Port, Opts) of
+	"~n   Opts: ~p"
+	"~n   Type: ~p", [Host, Port, Opts, Type]),
+    
+    case gen_tcp:connect(Host, Port, Opts) of
 	{ok, Socket} ->
 	    tsp("connect success"),
 	    {ok, Socket};
-	{error, nxdomain} ->
-	    tsp("connect error nxdomain when opts: ~p", [Opts]),
-	    connect(ip_comm, Host, Port, lists:delete(inet6, Opts));
-	{error, eafnosupport}  ->
-	    tsp("connect error eafnosupport when opts: ~p", [Opts]),
-	    connect(ip_comm, Host, Port, lists:delete(inet6, Opts));
-	{error, econnreset} ->
-	    tsp("connect error econnreset when opts: ~p", [Opts]),
-	    connect(ip_comm, Host, Port, lists:delete(inet6, Opts));
-	{error, enetunreach}  ->
-	    tsp("connect error eafnosupport when opts: ~p", [Opts]),
-	    connect(ip_comm, Host, Port, lists:delete(inet6, Opts));
-	{error, {enfile,_}} ->
-	    tsp("connect error enfile when opts: ~p", [Opts]),
-	    {error, enfile};
+
+	{error, nxdomain} when Type =:= inet6 ->
+	    tsp("connect error nxdomain when"
+		"~n   Opts: ~p", [Opts]),
+	    connect(ip_comm, Host, Port, Opts -- [inet6], inet);
+	{error, eafnosupport} when Type =:= inet6 ->
+	    tsp("connect error eafnosupport when"
+		"~n   Opts: ~p", [Opts]),
+	    connect(ip_comm, Host, Port, Opts -- [inet6], inet);
+	{error, econnreset} when Type =:= inet6 ->
+	    tsp("connect error econnreset when"
+		"~n   Opts: ~p", [Opts]),
+	    connect(ip_comm, Host, Port, Opts -- [inet6], inet);
+	{error, enetunreach} when Type =:= inet6 ->
+	    tsp("connect error eafnosupport when"
+		"~n   Opts: ~p", [Opts]),
+	    connect(ip_comm, Host, Port, Opts -- [inet6], inet);
+	{error, econnrefused} when Type =:= inet6 ->
+	    tsp("connect error econnrefused when"
+		"~n   Opts: ~p", [Opts]),
+	    connect(ip_comm, Host, Port, Opts -- [inet6], inet);
+
 	Error ->
-	    tsp("Unexpected error: "
+	    tsp("connect(ip_conn) -> Fatal connect error: "
 		"~n   Error: ~p"
 		"~nwhen"
 		"~n   Host:  ~p"
 		"~n   Port:  ~p"
 		"~n   Opts:  ~p"
-		"~n", [Error, Host, Port, Opts]),
+		"~n   Type:  ~p"
+		"~n", [Error, Host, Port, Opts, Type]),
 	    Error
     end.
-
+			
 
 send(ssl, Socket, Data) ->
     ssl:send(Socket, Data);
@@ -509,12 +633,15 @@ tsp(F) ->
     tsp(F, []).
 tsp(F, A) ->
     Timestamp = formated_timestamp(), 
-    test_server:format("*** ~s ~p ~p ~w:" ++ F ++ "~n", 
-		       [Timestamp, node(), self(), ?MODULE | A]).
+    test_server:format("*** ~s ~p ~p " ++ F ++ "~n", 
+		       [Timestamp, node(), self() | A]).
 
 tsf(Reason) ->
     test_server:fail(Reason).
 
+tss(Time) ->
+    test_server:sleep(Time).
+
 formated_timestamp() ->
     format_timestamp( os:timestamp() ).