Merge branch 'bmk/inets/inets58_integration'

1 files changed, 62 insertions, 20 deletions

diff --git a/lib/inets/test/ftp_suite_lib.erl b/lib/inets/test/ftp_suite_lib.erl
index 3ebd02229e..ffb58c91b6 100644
--- a/lib/inets/test/ftp_suite_lib.erl
+++ b/lib/inets/test/ftp_suite_lib.erl
@@ -196,7 +196,9 @@ test_filenames() ->
 %% variable, but should NOT alter/remove any existing entries.
 %%--------------------------------------------------------------------
 init_per_testcase(Case, Config) 
-  when (Case =:= open) orelse (Case =:= open_port) ->
+  when (Case =:= open) orelse 
+       (Case =:= open_port) ->
+    put(ftp_testcase, Case), 
     io:format(user, "~n~n*** INIT ~w:~w ***~n~n", [?MODULE, Case]),
     inets:start(),
     NewConfig = data_dir(Config),
@@ -266,7 +268,7 @@ do_init_per_testcase(Case, Config) ->
  	end,
     Opts2 = 
 	case string:tokens(atom_to_list(Case), [$_]) of
-	    [_, "active" | _] ->
+	    ["active" | _] ->
 		[{mode, active}  | Opts1];
 	    _ ->
 		[{mode, passive} | Opts1]
@@ -367,8 +369,11 @@ open(Config) when is_list(Config) ->
 
 
 tc_open(Host) ->
+    p("tc_open -> entry with"
+      "~n   Host: ~p", [Host]),
     {ok, Pid} = ?ftp_open(Host, []),
     ok = ftp:close(Pid),
+    p("tc_open -> try (ok) open 1"),
     {ok, Pid1} = 
 	ftp:open({option_list, [{host,Host}, 
 				{port, ?FTP_PORT}, 
@@ -376,11 +381,13 @@ tc_open(Host) ->
 				{timeout, 30000}]}),
     ok = ftp:close(Pid1),
     
+    p("tc_open -> try (fail) open 2"),
     {error, ehost} = 
 	ftp:open({option_list, [{port, ?FTP_PORT}, {flags, [verbose]}]}),
     {ok, Pid2} = ftp:open(Host),
     ok = ftp:close(Pid2),
     
+    p("tc_open -> try (ok) open 3"),
     {ok, NewHost} = inet:getaddr(Host, inet),
     {ok, Pid3} = ftp:open(NewHost),
     ftp:user(Pid3, ?FTP_USER, ?FTP_PASS),
@@ -392,33 +399,68 @@ tc_open(Host) ->
 
     %% Bad input that has default values are ignored and the defult 
     %% is used.
+    p("tc_open -> try (ok) open 4"),
     {ok, Pid4} = 
-	ftp:open({option_list, [{host, Host}, {port, badarg}, 
-				{flags, [verbose]}, 
+	ftp:open({option_list, [{host,    Host}, 
+				{port,    badarg}, 
+				{flags,   [verbose]}, 
 				{timeout, 30000}]}),
     test_server:sleep(100),
     ok = ftp:close(Pid4),
+
+    p("tc_open -> try (ok) open 5"),
     {ok, Pid5} = 
-	ftp:open({option_list, [{host, Host}, {port, ?FTP_PORT}, 
-				{flags, [verbose]}, 
+	ftp:open({option_list, [{host,    Host}, 
+				{port,    ?FTP_PORT}, 
+				{flags,   [verbose]}, 
 				{timeout, -42}]}),
     test_server:sleep(100),
     ok = ftp:close(Pid5),
+
+    p("tc_open -> try (ok) open 6"),
     {ok, Pid6} = 
-	ftp:open({option_list, [{host, Host}, {port, ?FTP_PORT}, 
+	ftp:open({option_list, [{host,  Host}, 
+				{port,  ?FTP_PORT}, 
 				{flags, [verbose]}, 
-				{mode, cool}]}),
+				{mode,  cool}]}),
     test_server:sleep(100),
     ok = ftp:close(Pid6),
 
+    p("tc_open -> try (ok) open 7"),
     {ok, Pid7} = 
 	ftp:open(Host, [{port, ?FTP_PORT}, {verbose, true}, {timeout, 30000}]),
     ok = ftp:close(Pid7),
 
+    p("tc_open -> try (ok) open 8"),
     {ok, Pid8} = 
 	ftp:open(Host, ?FTP_PORT),
     ok = ftp:close(Pid8),
 
+    p("tc_open -> try (ok) open 9"),
+    {ok, Pid9} = 
+	ftp:open(Host, [{port,     ?FTP_PORT}, 
+			{verbose,  true}, 
+			{timeout,  30000}, 
+			{dtimeout, -99}]),
+    ok = ftp:close(Pid9),
+
+    p("tc_open -> try (ok) open 10"),
+    {ok, Pid10} = 
+	ftp:open(Host, [{port,     ?FTP_PORT}, 
+			{verbose,  true}, 
+			{timeout,  30000}, 
+			{dtimeout, "foobar"}]),
+    ok = ftp:close(Pid10),
+
+    p("tc_open -> try (ok) open 11"),
+    {ok, Pid11} = 
+	ftp:open(Host, [{port,     ?FTP_PORT}, 
+			{verbose,  true}, 
+			{timeout,  30000}, 
+			{dtimeout, 1}]),
+    ok = ftp:close(Pid11),
+
+    p("tc_open -> done"),
     ok.
 
     
@@ -445,7 +487,7 @@ passive_user(suite) ->
     [];
 passive_user(Config) when is_list(Config) ->
     Pid = ?config(ftp, Config),
-    io:format("Pid: ~p~n",[Pid]),
+    p("Pid: ~p",[Pid]),
     do_user(Pid).
 
 
@@ -967,13 +1009,13 @@ api_missuse(doc)->
     ["Test that behaviour of the ftp process if the api is abused"];
 api_missuse(suite) -> [];
 api_missuse(Config) when is_list(Config) ->
-    io:format("api_missuse -> entry~n", []),
+    p("api_missuse -> entry"),
     Flag =  process_flag(trap_exit, true),
     Pid = ?config(ftp, Config),
     Host = ftp_host(Config), 
     
     %% Serious programming fault, connetion will be shut down 
-    io:format("api_missuse -> verify bad call termination (~p)~n", [Pid]),
+    p("api_missuse -> verify bad call termination (~p)", [Pid]),
     case (catch gen_server:call(Pid, {self(), foobar, 10}, infinity)) of
 	{error, {connection_terminated, 'API_violation'}} ->
 	    ok;
@@ -983,23 +1025,23 @@ api_missuse(Config) when is_list(Config) ->
     test_server:sleep(500),
     undefined = process_info(Pid, status),
 
-    io:format("api_missuse -> start new client~n", []),
+    p("api_missuse -> start new client"),
     {ok, Pid2} =  ?ftp_open(Host, []),
     %% Serious programming fault, connetion will be shut down 
-    io:format("api_missuse -> verify bad cast termination~n", []),
+    p("api_missuse -> verify bad cast termination"),
     gen_server:cast(Pid2, {self(), foobar, 10}),
     test_server:sleep(500),
     undefined = process_info(Pid2, status),
 
-    io:format("api_missuse -> start new client~n", []),
+    p("api_missuse -> start new client"),
     {ok, Pid3} =  ?ftp_open(Host, []),
     %% Could be an innocent misstake the connection lives. 
-    io:format("api_missuse -> verify bad bang~n", []),
+    p("api_missuse -> verify bad bang"),
     Pid3 ! foobar, 
     test_server:sleep(500),
     {status, _} = process_info(Pid3, status),
     process_flag(trap_exit, Flag),
-    io:format("api_missuse -> done~n", []),
+    p("api_missuse -> done"),
     ok.
 
 
@@ -1567,9 +1609,9 @@ split([], I, Is) ->
     lists:reverse([lists:reverse(I)| Is]).
 
 do_ftp_open(Host, Opts) ->
-    io:format("do_ftp_open -> entry with"
-	      "~n   Host: ~p"
-	      "~n   Opts: ~p", [Host, Opts]), 
+    p("do_ftp_open -> entry with"
+      "~n   Host: ~p"
+      "~n   Opts: ~p", [Host, Opts]), 
     case ftp:open(Host, Opts) of
 	{ok, _} = OK ->
 	    OK;
@@ -1595,7 +1637,7 @@ passwd() ->
 ftpd_hosts(Config) ->
     DataDir = ?config(data_dir, Config),
     FileName = filename:join([DataDir, "../ftp_SUITE_data/", ftpd_hosts]),
-    io:format("FileName: ~p~n", [FileName]),
+    p("FileName: ~p", [FileName]),
     case file:consult(FileName) of
 	{ok, [Hosts]} when is_list(Hosts) ->
 	    Hosts;