Merge branch 'hans/ssh/cuddle_tests'

Conflicts:
	lib/ssh/test/ssh_algorithms_SUITE.erl

12 files changed, 244 insertions, 146 deletions

diff --git a/lib/ssh/test/Makefile b/lib/ssh/test/Makefile
index 4ecc662c13..6ce6d6f537 100644
--- a/lib/ssh/test/Makefile
+++ b/lib/ssh/test/Makefile
@@ -55,6 +55,7 @@ MODULES= \
 	ssh_relay
 
 HRL_FILES_NEEDED_IN_TEST= \
+	$(ERL_TOP)/lib/ssh/test/ssh_test_lib.hrl \
 	$(ERL_TOP)/lib/ssh/src/ssh.hrl \
 	$(ERL_TOP)/lib/ssh/src/ssh_xfer.hrl
 
diff --git a/lib/ssh/test/ssh_algorithms_SUITE.erl b/lib/ssh/test/ssh_algorithms_SUITE.erl
index 440308d1b3..9910b8f1d7 100644
--- a/lib/ssh/test/ssh_algorithms_SUITE.erl
+++ b/lib/ssh/test/ssh_algorithms_SUITE.erl
@@ -192,7 +192,7 @@ simple_exec_groups_no_match_too_large(Config) ->
 %%--------------------------------------------------------------------
 %% Testing all default groups
 
-simple_exec_groups() -> [{timetrap,{seconds,180}}].
+simple_exec_groups() -> [{timetrap,{minutes,5}}].
 
 simple_exec_groups(Config) ->
     Sizes = interpolate( public_key:dh_gex_group_sizes() ),
@@ -226,28 +226,13 @@ sshc_simple_exec(Config) ->
     KnownHosts = filename:join(PrivDir, "known_hosts"),
     {Host,Port} = ?config(srvr_addr, Config),
     Cmd = lists:concat(["ssh -p ",Port,
-			" -C -o UserKnownHostsFile=",KnownHosts,
+			" -C",
+			" -o UserKnownHostsFile=",KnownHosts,
+			" -o StrictHostKeyChecking=no",
 			" ",Host," 1+1."]),
     ct:log("~p",[Cmd]),
-    SshPort = open_port({spawn, Cmd}, [binary]),
-    Expect = <<"2\n">>,
-    rcv_expected(SshPort, Expect).
-
-
-rcv_expected(SshPort, Expect) ->
-    receive
-	{SshPort, {data,Expect}} ->
-	    ct:log("Got expected ~p from ~p",[Expect,SshPort]),
-	    catch port_close(SshPort),
-	    ok;
-	Other ->
-	    ct:log("Got UNEXPECTED ~p",[Other]),
-	    rcv_expected(SshPort, Expect)
-
-    after ?TIMEOUT ->
-	    catch port_close(SshPort),
-	    ct:fail("Did not receive answer")
-    end.
+    OpenSsh = ssh_test_lib:open_port({spawn, Cmd}, [eof,exit_status]),
+    ssh_test_lib:rcv_expected({data,<<"2\n">>}, OpenSsh, ?TIMEOUT).
 
 %%--------------------------------------------------------------------
 %% Connect to the ssh server of the OS
@@ -366,8 +351,8 @@ start_std_daemon(Opts, Config) ->
     ct:log("started ~p:~p  ~p",[Host,Port,Opts]),
     [{srvr_pid,Pid},{srvr_addr,{Host,Port}} | Config].
 
-start_pubkey_daemon(Opts, Config) ->
-    ct:log("starting pubkey_daemon",[]),
+start_pubkey_daemon(Opts0, Config) ->
+    Opts = [{auth_methods,"publickey"}|Opts0],
     {Pid, Host, Port} = ssh_test_lib:std_daemon1(Config, Opts),
     ct:log("started pubkey_daemon ~p:~p  ~p",[Host,Port,Opts]),
     [{srvr_pid,Pid},{srvr_addr,{Host,Port}} | Config].
diff --git a/lib/ssh/test/ssh_connection_SUITE.erl b/lib/ssh/test/ssh_connection_SUITE.erl
index a5f424f863..0f757a0322 100644
--- a/lib/ssh/test/ssh_connection_SUITE.erl
+++ b/lib/ssh/test/ssh_connection_SUITE.erl
@@ -23,6 +23,7 @@
 
 -include_lib("common_test/include/ct.hrl").
 -include_lib("ssh/src/ssh_connect.hrl").
+-include("ssh_test_lib.hrl").
 
 -compile(export_all).
 
@@ -655,15 +656,21 @@ max_channels_option(Config) when is_list(Config) ->
 						      {user_interaction, true},
 						      {user_dir, UserDir}]),
 
+    %% Allocate a number of ChannelId:s to play with. (This operation is not
+    %% counted by the max_channel option).
     {ok, ChannelId0} = ssh_connection:session_channel(ConnectionRef, infinity),
     {ok, ChannelId1} = ssh_connection:session_channel(ConnectionRef, infinity),
     {ok, ChannelId2} = ssh_connection:session_channel(ConnectionRef, infinity),
     {ok, ChannelId3} = ssh_connection:session_channel(ConnectionRef, infinity),
     {ok, ChannelId4} = ssh_connection:session_channel(ConnectionRef, infinity),
     {ok, ChannelId5} = ssh_connection:session_channel(ConnectionRef, infinity),
-    {ok, _ChannelId6} = ssh_connection:session_channel(ConnectionRef, infinity),
+    {ok, ChannelId6} = ssh_connection:session_channel(ConnectionRef, infinity),
+    {ok, _ChannelId7} = ssh_connection:session_channel(ConnectionRef, infinity),
 
-    %%%---- shell
+    %% Now start to open the channels (this is counted my max_channels) to check that
+    %% it gives a failure at right place
+
+    %%%---- Channel 1(3): shell
     ok = ssh_connection:shell(ConnectionRef,ChannelId0),
     receive
 	{ssh_cm,ConnectionRef, {data, ChannelId0, 0, <<"Eshell",_/binary>>}} ->
@@ -672,10 +679,10 @@ max_channels_option(Config) when is_list(Config) ->
 	    ct:fail("CLI Timeout")
     end,
 
-    %%%---- subsystem "echo_n"
+    %%%---- Channel 2(3): subsystem "echo_n"
     success = ssh_connection:subsystem(ConnectionRef, ChannelId1, "echo_n", infinity),
 
-    %%%---- exec #1
+    %%%---- Channel 3(3): exec. This closes itself.
     success = ssh_connection:exec(ConnectionRef, ChannelId2, "testing1.\n", infinity),
     receive
 	{ssh_cm, ConnectionRef, {data, ChannelId2, 0, <<"testing1",_/binary>>}} ->
@@ -684,13 +691,13 @@ max_channels_option(Config) when is_list(Config) ->
 	    ct:fail("Exec #1 Timeout")
     end,
 
-    %%%---- ptty
-    success = ssh_connection:ptty_alloc(ConnectionRef, ChannelId3, []),
+    %%%---- Channel 3(3): subsystem "echo_n" (Note that ChannelId2 should be closed now)
+    ?wait_match(success, ssh_connection:subsystem(ConnectionRef, ChannelId3, "echo_n", infinity)),
 
-    %%%---- exec #2
+    %%%---- Channel 4(3) !: exec  This should fail
     failure = ssh_connection:exec(ConnectionRef, ChannelId4, "testing2.\n", infinity),
 
-    %%%---- close the shell
+    %%%---- close the shell (Frees one channel)
     ok = ssh_connection:send(ConnectionRef, ChannelId0, "exit().\n", 5000),
     
     %%%---- wait for the subsystem to terminate
@@ -703,14 +710,11 @@ max_channels_option(Config) when is_list(Config) ->
 	    ct:fail("exit Timeout",[])
     end,
 
-    %%%---- exec #3
-    success = ssh_connection:exec(ConnectionRef, ChannelId5, "testing3.\n", infinity),
-    receive
-	{ssh_cm, ConnectionRef, {data, ChannelId5, 0, <<"testing3",_/binary>>}} ->
-	    ok
-    after 5000 ->
-	    ct:fail("Exec #3 Timeout")
-    end,
+    %%---- Try that we can open one channel instead of the closed one
+    ?wait_match(success, ssh_connection:subsystem(ConnectionRef, ChannelId5, "echo_n", infinity)),
+
+    %%---- But not a fourth one...
+    failure = ssh_connection:subsystem(ConnectionRef, ChannelId6, "echo_n", infinity),
 
     ssh:close(ConnectionRef),
     ssh:stop_daemon(Pid).
diff --git a/lib/ssh/test/ssh_options_SUITE.erl b/lib/ssh/test/ssh_options_SUITE.erl
index 4106385d2d..4ca6a473fa 100644
--- a/lib/ssh/test/ssh_options_SUITE.erl
+++ b/lib/ssh/test/ssh_options_SUITE.erl
@@ -51,9 +51,7 @@
 	 ssh_connect_arg4_timeout/1, 
 	 ssh_connect_negtimeout_parallel/1, 
 	 ssh_connect_negtimeout_sequential/1, 
-	 ssh_connect_nonegtimeout_connected_parallel/0, 
 	 ssh_connect_nonegtimeout_connected_parallel/1,
-	 ssh_connect_nonegtimeout_connected_sequential/0,
 	 ssh_connect_nonegtimeout_connected_sequential/1,
 	 ssh_connect_timeout/1, connect/4,
 	 ssh_daemon_minimal_remote_max_packet_size_option/1, 
@@ -82,7 +80,7 @@
 
 suite() ->
     [{ct_hooks,[ts_install_cth]},
-     {timetrap,{seconds,40}}].
+     {timetrap,{seconds,30}}].
 
 all() -> 
     [connectfun_disconnectfun_server,
@@ -982,16 +980,10 @@ ssh_connect_negtimeout(Config, Parallel) ->
 
 %%--------------------------------------------------------------------
 %%% Test that ssh connection does not timeout if the connection is established (parallel)
-
-ssh_connect_nonegtimeout_connected_parallel() -> [{timetrap,{seconds,90}}].
-
 ssh_connect_nonegtimeout_connected_parallel(Config) ->
     ssh_connect_nonegtimeout_connected(Config, true).
 
 %%% Test that ssh connection does not timeout if the connection is established (non-parallel)
-
-ssh_connect_nonegtimeout_connected_sequential() -> [{timetrap,{seconds,90}}].
-
 ssh_connect_nonegtimeout_connected_sequential(Config) ->
     ssh_connect_nonegtimeout_connected(Config, false).
 
@@ -1000,7 +992,7 @@ ssh_connect_nonegtimeout_connected(Config, Parallel) ->
     process_flag(trap_exit, true),
     SystemDir = filename:join(?config(priv_dir, Config), system),
     UserDir = ?config(priv_dir, Config),
-    NegTimeOut = 20000,				% ms
+    NegTimeOut = 2000,				% ms
     ct:log("Parallel: ~p",[Parallel]),
    
     {_Pid, _Host, Port} = ssh_test_lib:daemon([{system_dir, SystemDir},{user_dir, UserDir},
@@ -1131,21 +1123,7 @@ max_sessions(Config, ParallelLogin, Connect0) when is_function(Connect0,2) ->
 		    %% This is expected
 		    %% Now stop one connection and try to open one more
 		    ok = ssh:close(hd(Connections)),
-		    receive after 250 -> ok end, % sleep so the supervisor has time to count down. Not nice...
-		    try Connect(Host,Port)
-		    of
-			_ConnectionRef1 ->
-			    %% Step 3 ok: could set up one more connection after killing one
-			    %% Thats good.
-			    ssh:stop_daemon(Pid),
-			    ok
-		    catch
-			error:{badmatch,{error,"Connection closed"}} ->
-			    %% Bad indeed. Could not set up one more connection even after killing
-			    %% one existing. Very bad.
-			    ssh:stop_daemon(Pid),
-			    {fail,"Does not decrease # active sessions"}
-		    end
+		    try_to_connect(Connect, Host, Port, Pid)
 	    end
     catch
 	error:{badmatch,{error,"Connection closed"}} ->
@@ -1153,6 +1131,35 @@ max_sessions(Config, ParallelLogin, Connect0) when is_function(Connect0,2) ->
 	    {fail,"Too few connections accepted"}
     end.
 
+
+try_to_connect(Connect, Host, Port, Pid) ->
+    {ok,Tref} = timer:send_after(3000, timeout_no_connection), % give the supervisors some time...
+    try_to_connect(Connect, Host, Port, Pid, Tref, 1). % will take max 3300 ms after 11 tries
+
+try_to_connect(Connect, Host, Port, Pid, Tref, N) ->
+     try Connect(Host,Port)
+     of
+	 _ConnectionRef1 ->
+	     %% Step 3 ok: could set up one more connection after killing one
+	     %% Thats good.
+	     timer:cancel(Tref),
+	     ssh:stop_daemon(Pid),
+	     receive % flush. 
+		 timeout_no_connection -> ok
+	     after 0 -> ok
+	     end
+     catch
+	 error:{badmatch,{error,"Connection closed"}} ->
+	     %% Could not set up one more connection. Try again until timeout.
+	     receive
+		 timeout_no_connection ->
+		     ssh:stop_daemon(Pid),
+		     {fail,"Does not decrease # active sessions"}
+	     after N*50 -> % retry after this time
+		     try_to_connect(Connect, Host, Port, Pid, Tref, N+1)
+	     end
+     end.
+
 %%--------------------------------------------------------------------
 %% Internal functions ------------------------------------------------
 %%--------------------------------------------------------------------
diff --git a/lib/ssh/test/ssh_sftp_SUITE.erl b/lib/ssh/test/ssh_sftp_SUITE.erl
index e06b646bba..17ea1887be 100644
--- a/lib/ssh/test/ssh_sftp_SUITE.erl
+++ b/lib/ssh/test/ssh_sftp_SUITE.erl
@@ -300,9 +300,9 @@ end_per_testcase(_, Config) ->
 
 end_per_testcase(Config) ->
     {Sftp, Connection} = ?config(sftp, Config),
-    ssh_sftp:stop_channel(Sftp),
+    ok = ssh_sftp:stop_channel(Sftp),
     catch ssh_sftp:stop_channel(?config(channel_pid2, Config)),
-    ssh:close(Connection).
+    ok = ssh:close(Connection).
 
 %%--------------------------------------------------------------------
 %% Test Cases --------------------------------------------------------
@@ -364,7 +364,7 @@ write_file(Config) when is_list(Config) ->
     {Sftp, _} = ?config(sftp, Config),
 
     Data = list_to_binary("Hej hopp!"),
-    ssh_sftp:write_file(Sftp, FileName, [Data]),
+    ok = ssh_sftp:write_file(Sftp, FileName, [Data]),
     {ok, Data} = file:read_file(FileName).
 
 %%--------------------------------------------------------------------
@@ -377,7 +377,7 @@ write_file_iolist(Config) when is_list(Config) ->
     Data = list_to_binary("Hej hopp!"),
     lists:foreach(
       fun(D) ->
-	      ssh_sftp:write_file(Sftp, FileName, [D]),
+	      ok = ssh_sftp:write_file(Sftp, FileName, [D]),
 	      Expected = if is_binary(D) -> D;
 			    is_list(D) -> list_to_binary(D)
 			 end,
@@ -396,7 +396,7 @@ write_big_file(Config) when is_list(Config) ->
     {Sftp, _} = ?config(sftp, Config),
 
     Data = list_to_binary(lists:duplicate(750000,"a")),
-    ssh_sftp:write_file(Sftp, FileName, [Data]),
+    ok = ssh_sftp:write_file(Sftp, FileName, [Data]),
     {ok, Data} = file:read_file(FileName).
 
 %%--------------------------------------------------------------------
@@ -408,7 +408,7 @@ sftp_read_big_file(Config) when is_list(Config) ->
 
     Data = list_to_binary(lists:duplicate(750000,"a")),
     ct:log("Data size to write is ~p bytes",[size(Data)]),
-    ssh_sftp:write_file(Sftp, FileName, [Data]),
+    ok = ssh_sftp:write_file(Sftp, FileName, [Data]),
     {ok, Data} = ssh_sftp:read_file(Sftp, FileName).
 
 %%--------------------------------------------------------------------
@@ -499,7 +499,7 @@ set_attributes(Config) when is_list(Config) ->
     io:put_chars(Fd,"foo"),
     ok = ssh_sftp:write_file_info(Sftp, FileName, #file_info{mode=8#400}),
     {error, eacces} = file:write_file(FileName, "hello again"),
-    ssh_sftp:write_file_info(Sftp, FileName, #file_info{mode=8#600}),
+    ok = ssh_sftp:write_file_info(Sftp, FileName, #file_info{mode=8#600}),
     ok = file:write_file(FileName, "hello again").
 
 %%--------------------------------------------------------------------
@@ -548,7 +548,7 @@ position(Config) when is_list(Config) ->
     {Sftp, _} = ?config(sftp, Config),
 
     Data = list_to_binary("1234567890"),
-    ssh_sftp:write_file(Sftp, FileName, [Data]),
+    ok = ssh_sftp:write_file(Sftp, FileName, [Data]),
     {ok, Handle} = ssh_sftp:open(Sftp, FileName, [read]),
 
     {ok, 3} = ssh_sftp:position(Sftp, Handle, {bof, 3}),
@@ -576,7 +576,7 @@ pos_read(Config) when is_list(Config) ->
     FileName = ?config(testfile, Config),
     {Sftp, _} = ?config(sftp, Config),
     Data = list_to_binary("Hej hopp!"),
-    ssh_sftp:write_file(Sftp, FileName, [Data]),
+    ok = ssh_sftp:write_file(Sftp, FileName, [Data]),
 
     {ok, Handle} = ssh_sftp:open(Sftp, FileName, [read]),
     {async, Ref} = ssh_sftp:apread(Sftp, Handle, {bof, 5}, 4),
@@ -606,7 +606,7 @@ pos_write(Config) when is_list(Config) ->
     {ok, Handle} = ssh_sftp:open(Sftp, FileName, [write]),
 
     Data = list_to_binary("Bye,"),
-    ssh_sftp:write_file(Sftp, FileName, [Data]),
+    ok = ssh_sftp:write_file(Sftp, FileName, [Data]),
 
     NewData = list_to_binary(" see you tomorrow"),
     {async, Ref} = ssh_sftp:apwrite(Sftp, Handle, {bof, 4}, NewData),
diff --git a/lib/ssh/test/ssh_sup_SUITE.erl b/lib/ssh/test/ssh_sup_SUITE.erl
index f800ea806d..2dc4263603 100644
--- a/lib/ssh/test/ssh_sup_SUITE.erl
+++ b/lib/ssh/test/ssh_sup_SUITE.erl
@@ -22,21 +22,23 @@
 -module(ssh_sup_SUITE).
 -include_lib("common_test/include/ct.hrl").
 -include_lib("ssh/src/ssh.hrl").
+-include("ssh_test_lib.hrl").
 
 %% Note: This directive should only be used in test suites.
 -compile(export_all).
 
--define(WAIT_FOR_SHUTDOWN, 500).
 -define(USER, "Alladin").
 -define(PASSWD, "Sesame").
 
+-define(WAIT_FOR_SHUTDOWN, 500).
+
 %%--------------------------------------------------------------------
 %% Common Test interface functions -----------------------------------
 %%--------------------------------------------------------------------
 
 suite() ->
     [{ct_hooks,[ts_install_cth]},
-     {timetrap,{seconds,40}}].
+     {timetrap,{seconds,100}}].
 
 all() -> 
     [default_tree, sshc_subtree, sshd_subtree, sshd_subtree_profile].
@@ -92,8 +94,8 @@ default_tree(Config) when is_list(Config) ->
 	lists:keysearch(sshc_sup, 1, TopSupChildren),
     {value, {sshd_sup, _,supervisor,[sshd_sup]}} = 
 	lists:keysearch(sshd_sup, 1, TopSupChildren),
-    [] = supervisor:which_children(sshc_sup),
-    [] = supervisor:which_children(sshd_sup).
+    ?wait_match([], supervisor:which_children(sshc_sup)),
+    ?wait_match([], supervisor:which_children(sshd_sup)).
 
 sshc_subtree() ->
     [{doc, "Make sure the sshc subtree is correct"}].
@@ -101,24 +103,26 @@ sshc_subtree(Config) when is_list(Config) ->
     {_Pid, Host, Port} = ?config(server, Config),
     UserDir = ?config(userdir, Config),
 
-    [] = supervisor:which_children(sshc_sup),
+    ?wait_match([], supervisor:which_children(sshc_sup)),
+
     {ok, Pid1} = ssh:connect(Host, Port, [{silently_accept_hosts, true},
 					  {user_interaction, false},
 					  {user, ?USER}, {password, ?PASSWD},{user_dir, UserDir}]),
-    [{_, _,supervisor,[ssh_connection_handler]}] =
-	supervisor:which_children(sshc_sup),
+    ?wait_match([{_, _,supervisor,[ssh_connection_handler]}],
+		supervisor:which_children(sshc_sup)),
+
     {ok, Pid2} = ssh:connect(Host, Port, [{silently_accept_hosts, true},
 					  {user_interaction, false},
 					  {user, ?USER}, {password, ?PASSWD}, {user_dir, UserDir}]),
-    [{_,_,supervisor,[ssh_connection_handler]}, 
-     {_,_,supervisor,[ssh_connection_handler]}] = 
-	supervisor:which_children(sshc_sup),
+    ?wait_match([{_,_,supervisor,[ssh_connection_handler]}, 
+		 {_,_,supervisor,[ssh_connection_handler]}],
+		supervisor:which_children(sshc_sup)),
+
     ssh:close(Pid1),
-    [{_,_,supervisor,[ssh_connection_handler]}] = 
-	supervisor:which_children(sshc_sup),
+    ?wait_match([{_,_,supervisor,[ssh_connection_handler]}],
+		supervisor:which_children(sshc_sup)),
     ssh:close(Pid2),
-    ct:sleep(?WAIT_FOR_SHUTDOWN),
-    [] = supervisor:which_children(sshc_sup).
+    ?wait_match([], supervisor:which_children(sshc_sup)).
 
 sshd_subtree() ->
     [{doc, "Make sure the sshd subtree is correct"}].
@@ -130,14 +134,16 @@ sshd_subtree(Config) when is_list(Config) ->
 			      {failfun, fun ssh_test_lib:failfun/2},
 			      {user_passwords,
 			       [{?USER, ?PASSWD}]}]),
-    [{{server,ssh_system_sup, HostIP, Port, ?DEFAULT_PROFILE},
-      Daemon, supervisor,
-      [ssh_system_sup]}] = 
-	supervisor:which_children(sshd_sup),
+
+    ?wait_match([{{server,ssh_system_sup, HostIP, Port, ?DEFAULT_PROFILE},
+		  Daemon, supervisor,
+		  [ssh_system_sup]}],
+		supervisor:which_children(sshd_sup),
+		Daemon),
     check_sshd_system_tree(Daemon, Config),
     ssh:stop_daemon(HostIP, Port),
     ct:sleep(?WAIT_FOR_SHUTDOWN),
-    [] = supervisor:which_children(sshd_sup).
+    ?wait_match([], supervisor:which_children(sshd_sup)).
 
 sshd_subtree_profile() ->
     [{doc, "Make sure the sshd subtree using profile option is correct"}].	
@@ -152,14 +158,15 @@ sshd_subtree_profile(Config) when is_list(Config) ->
 				  {user_passwords,
 				   [{?USER, ?PASSWD}]},
 				  {profile, Profile}]),
-    [{{server,ssh_system_sup, HostIP,Port,Profile},
-      Daemon, supervisor,
-      [ssh_system_sup]}] = 
-	supervisor:which_children(sshd_sup),
+    ?wait_match([{{server,ssh_system_sup, HostIP,Port,Profile},
+		  Daemon, supervisor,
+		  [ssh_system_sup]}],
+		supervisor:which_children(sshd_sup),
+		Daemon),
     check_sshd_system_tree(Daemon, Config),
     ssh:stop_daemon(HostIP, Port, Profile),
     ct:sleep(?WAIT_FOR_SHUTDOWN),
-    [] = supervisor:which_children(sshd_sup).
+    ?wait_match([], supervisor:which_children(sshd_sup)).
 
 
 check_sshd_system_tree(Daemon, Config) -> 
@@ -170,28 +177,31 @@ check_sshd_system_tree(Daemon, Config) ->
 						   {user_interaction, false},
 						   {user, ?USER}, {password, ?PASSWD},{user_dir, UserDir}]),
     
-    [{_,SubSysSup, supervisor,[ssh_subsystem_sup]},
-     {{ssh_acceptor_sup,_,_,_}, AccSup, supervisor,[ssh_acceptor_sup]}] 
-	= supervisor:which_children(Daemon),
+    ?wait_match([{_,SubSysSup, supervisor,[ssh_subsystem_sup]},
+		 {{ssh_acceptor_sup,_,_,_}, AccSup, supervisor,[ssh_acceptor_sup]}],
+		supervisor:which_children(Daemon),
+	       [SubSysSup,AccSup]),
     
-    [{{server,ssh_connection_sup, _,_},
-      ConnectionSup, supervisor,
-      [ssh_connection_sup]},
-     {{server,ssh_channel_sup,_ ,_},
-      ChannelSup,supervisor,
-      [ssh_channel_sup]}] = supervisor:which_children(SubSysSup),
+    ?wait_match([{{server,ssh_connection_sup, _,_},
+		  ConnectionSup, supervisor,
+		  [ssh_connection_sup]},
+		 {{server,ssh_channel_sup,_ ,_},
+		  ChannelSup,supervisor,
+		  [ssh_channel_sup]}],
+		supervisor:which_children(SubSysSup),
+		[ConnectionSup,ChannelSup]),
     
-    [{{ssh_acceptor_sup,_,_,_},_,worker,[ssh_acceptor]}] = 
-	supervisor:which_children(AccSup),
+    ?wait_match([{{ssh_acceptor_sup,_,_,_},_,worker,[ssh_acceptor]}],
+		supervisor:which_children(AccSup)),
     
-    [{_, _, worker,[ssh_connection_handler]}] =
-	supervisor:which_children(ConnectionSup),
+    ?wait_match([{_, _, worker,[ssh_connection_handler]}],
+		supervisor:which_children(ConnectionSup)),
     
-    [] = supervisor:which_children(ChannelSup),
+    ?wait_match([], supervisor:which_children(ChannelSup)),
     
     ssh_sftp:start_channel(Client),
 
-    [{_, _,worker,[ssh_channel]}] = 
-	supervisor:which_children(ChannelSup),
+    ?wait_match([{_, _,worker,[ssh_channel]}],
+		supervisor:which_children(ChannelSup)),
     ssh:close(Client).
   
diff --git a/lib/ssh/test/ssh_test_cli.erl b/lib/ssh/test/ssh_test_cli.erl
index 697ddb730d..f96b9967d2 100644
--- a/lib/ssh/test/ssh_test_cli.erl
+++ b/lib/ssh/test/ssh_test_cli.erl
@@ -75,10 +75,11 @@ terminate(_Why, _S) ->
 
 run_portprog(User, cli, TmpDir) ->
     Pty_bin = os:find_executable("cat"), 
-    open_port({spawn_executable, Pty_bin},
-	      [stream, {cd, TmpDir}, {env, [{"USER", User}]},
-	       {args, []}, binary,
-	       exit_status, use_stdio, stderr_to_stdout]).
+    ssh_test_lib:open_port({spawn_executable, Pty_bin},
+			   [stream,
+			    {cd, TmpDir},
+			    {env, [{"USER", User}]},
+			    {args, []}]).
 
 get_ssh_user(Ref) ->
     [{user, User}] = ssh:connection_info(Ref, [user]),
diff --git a/lib/ssh/test/ssh_test_lib.erl b/lib/ssh/test/ssh_test_lib.erl
index 69329a5c75..5cf2925671 100644
--- a/lib/ssh/test/ssh_test_lib.erl
+++ b/lib/ssh/test/ssh_test_lib.erl
@@ -32,15 +32,8 @@
 
 -define(TIMEOUT, 50000).
 
-connect(Options) ->
-    connect(hostname(), inet_port(), Options).
-
 connect(Port, Options) when is_integer(Port) ->
-    connect(hostname(), Port, Options);
-connect(any, Options) ->
-    connect(hostname(), inet_port(), Options);
-connect(Host, Options) ->
-    connect(Host, inet_port(), Options).
+    connect(hostname(), Port, Options).
 
 connect(any, Port, Options) ->
     connect(hostname(), Port, Options);
@@ -205,6 +198,35 @@ reply(TestCase, Result) ->
 %%ct:log("reply ~p sending ~p ! ~p",[self(), TestCase, Result]),
     TestCase ! Result.
 
+
+
+rcv_expected(Expect, SshPort, Timeout) ->
+    receive
+	{SshPort, Expect} ->
+	    ct:log("Got expected ~p from ~p",[Expect,SshPort]),
+	    catch port_close(SshPort),
+	    rcv_lingering(50);
+	Other ->
+	    ct:log("Got UNEXPECTED ~p~nExpect ~p",[Other, {SshPort,Expect}]),
+	    rcv_expected(Expect, SshPort, Timeout)
+
+    after Timeout ->
+	    catch port_close(SshPort),
+	    ct:fail("Did not receive answer")
+    end.
+
+rcv_lingering(Timeout) ->
+    receive
+	Msg ->
+	    ct:log("Got LINGERING ~p",[Msg]),
+	    rcv_lingering(Timeout)
+
+    after Timeout ->
+	    ct:log("No more lingering messages",[]),
+	    ok
+    end.
+
+
 receive_exec_result(Msg) ->
     ct:log("Expect data! ~p", [Msg]),
     receive
@@ -474,8 +496,9 @@ openssh_supports(ClientOrServer, Tag, Alg) when ClientOrServer == sshc ;
 %% Check if we have a "newer" ssh client that supports these test cases
 
 ssh_client_supports_Q() ->
-    ErlPort = open_port({spawn, "ssh -Q cipher"}, [exit_status, stderr_to_stdout]),
-    0 == check_ssh_client_support2(ErlPort).
+    0 == check_ssh_client_support2(
+	   ?MODULE:open_port({spawn, "ssh -Q cipher"})
+	  ).
 
 check_ssh_client_support2(P) ->
     receive
@@ -694,3 +717,16 @@ has_inet6_address() ->
     catch
 	throw:6 -> true
     end.
+
+%%%----------------------------------------------------------------
+open_port(Arg1) ->
+    ?MODULE:open_port(Arg1, []).
+
+open_port(Arg1, ExtraOpts) ->
+    erlang:open_port(Arg1,
+		     [binary,
+		      stderr_to_stdout,
+		      exit_status,
+		      use_stdio,
+		      overlapped_io, hide %only affects windows
+		      | ExtraOpts]).
diff --git a/lib/ssh/test/ssh_test_lib.hrl b/lib/ssh/test/ssh_test_lib.hrl
new file mode 100644
index 0000000000..7cb7edeaa8
--- /dev/null
+++ b/lib/ssh/test/ssh_test_lib.hrl
@@ -0,0 +1,27 @@
+%%-------------------------------------------------------------------------
+%% Help macro
+%%-------------------------------------------------------------------------
+-define(wait_match(Pattern, FunctionCall, Bind, Timeout, Ntries),
+	Bind =
+	    (fun() -> 
+		     F = fun(N, F1) ->
+				 case FunctionCall of
+				     Pattern -> Bind;
+				     _ when N>0 ->
+					 ct:pal("Must sleep ~p ms at ~p:~p",[Timeout,?MODULE,?LINE]),
+					 timer:sleep(Timeout),
+					 F1(N-1, F1);
+				     Other ->  
+					 ct:fail("Unexpected ~p:~p  ~p",[?MODULE,?LINE,Other])
+				 end
+			 end,
+		     F(Ntries, F)
+	     end)()
+       ).
+
+-define(wait_match(Pattern, FunctionCall, Timeout, Ntries),  ?wait_match(Pattern, FunctionCall, ok, Timeout, Ntries)).
+
+-define(wait_match(Pattern, FunctionCall, Bind),  ?wait_match(Pattern, FunctionCall, Bind, 500, 10) ).
+
+-define(wait_match(Pattern, FunctionCall),  ?wait_match(Pattern, FunctionCall, ok) ).
+
diff --git a/lib/ssh/test/ssh_to_openssh_SUITE.erl b/lib/ssh/test/ssh_to_openssh_SUITE.erl
index 5b65edc32f..2be75fd7f3 100644
--- a/lib/ssh/test/ssh_to_openssh_SUITE.erl
+++ b/lib/ssh/test/ssh_to_openssh_SUITE.erl
@@ -34,7 +34,7 @@
 %%--------------------------------------------------------------------
 
 suite() ->
-    [{timetrap,{seconds,40}}].
+    [{timetrap,{seconds,20}}].
 
 all() -> 
     case os:find_executable("ssh") of
@@ -50,13 +50,15 @@ groups() ->
     [{erlang_client, [], [erlang_shell_client_openssh_server,
 			  erlang_client_openssh_server_exec_compressed,
 			  erlang_client_openssh_server_setenv,
-			  erlang_client_openssh_server_publickey_rsa,
 			  erlang_client_openssh_server_publickey_dsa,
+			  erlang_client_openssh_server_publickey_rsa,
 			  erlang_client_openssh_server_password,
 			  erlang_client_openssh_server_kexs,
 			  erlang_client_openssh_server_nonexistent_subsystem
 			 ]},
-     {erlang_server, [], [erlang_server_openssh_client_public_key_dsa]}
+     {erlang_server, [], [erlang_server_openssh_client_public_key_dsa,
+			  erlang_server_openssh_client_public_key_rsa
+			 ]}
     ].
 
 init_per_suite(Config) ->
@@ -74,6 +76,7 @@ init_per_group(erlang_server, Config) ->
     DataDir = ?config(data_dir, Config),
     UserDir = ?config(priv_dir, Config),
     ssh_test_lib:setup_dsa_known_host(DataDir, UserDir),
+    ssh_test_lib:setup_rsa_known_host(DataDir, UserDir),
     Config;
 init_per_group(erlang_client, Config) ->
     CommonAlgs = ssh_test_lib:algo_intersection(
@@ -86,6 +89,7 @@ init_per_group(_, Config) ->
 end_per_group(erlang_server, Config) ->
     UserDir = ?config(priv_dir, Config),
     ssh_test_lib:clean_dsa(UserDir),
+    ssh_test_lib:clean_rsa(UserDir),
     Config;
 end_per_group(_, Config) ->
     Config.
@@ -93,6 +97,8 @@ end_per_group(_, Config) ->
 
 init_per_testcase(erlang_server_openssh_client_public_key_dsa, Config) ->
     chk_key(sshc, 'ssh-dss', ".ssh/id_dsa", Config);
+init_per_testcase(erlang_server_openssh_client_public_key_rsa, Config) ->
+    chk_key(sshc, 'ssh-rsa', ".ssh/id_rsa", Config);
 init_per_testcase(erlang_client_openssh_server_publickey_dsa, Config) ->
     chk_key(sshd, 'ssh-dss', ".ssh/id_dsa", Config);
 init_per_testcase(_TestCase, Config) ->
@@ -347,14 +353,24 @@ erlang_client_openssh_server_publickey_dsa(Config) when is_list(Config) ->
 
 %%--------------------------------------------------------------------
 erlang_server_openssh_client_public_key_dsa() ->
-    [{doc, "Validate using dsa publickey."}].
+    [{timetrap, {seconds,(?TIMEOUT div 1000)+10}},
+     {doc, "Validate using dsa publickey."}].
 erlang_server_openssh_client_public_key_dsa(Config) when is_list(Config) ->
+    erlang_server_openssh_client_public_key_X(Config, ssh_dsa).
+
+erlang_server_openssh_client_public_key_rsa() ->
+    [{timetrap, {seconds,(?TIMEOUT div 1000)+10}},
+     {doc, "Validate using rsa publickey."}].
+erlang_server_openssh_client_public_key_rsa(Config) when is_list(Config) ->
+    erlang_server_openssh_client_public_key_X(Config, ssh_rsa).
+
+
+erlang_server_openssh_client_public_key_X(Config, PubKeyAlg) ->
     SystemDir = ?config(data_dir, Config),
     PrivDir = ?config(priv_dir, Config),
     KnownHosts = filename:join(PrivDir, "known_hosts"),
-
     {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SystemDir},
-					     {public_key_alg, ssh_dsa},
+					     {public_key_alg, PubKeyAlg},
 					     {failfun, fun ssh_test_lib:failfun/2}]),
 
     ct:sleep(500),
@@ -362,18 +378,8 @@ erlang_server_openssh_client_public_key_dsa(Config) when is_list(Config) ->
     Cmd = "ssh -p " ++ integer_to_list(Port) ++
 	" -o UserKnownHostsFile=" ++ KnownHosts ++
 	" " ++ Host ++ " 1+1.",
-    SshPort = open_port({spawn, Cmd}, [binary, stderr_to_stdout]),
-
-    receive
-	{SshPort,{data, <<"2\n">>}} ->
-	    ok
-    after ?TIMEOUT ->
-	    receive
-		X -> ct:fail("Received: ~p",[X])
-	    after 0 ->
-		    ct:fail("Did not receive answer")
-	    end
-    end,
+    OpenSsh = ssh_test_lib:open_port({spawn, Cmd}),
+    ssh_test_lib:rcv_expected({data,<<"2\n">>}, OpenSsh, ?TIMEOUT),
     ssh:stop_daemon(Pid).
 
 %%--------------------------------------------------------------------
diff --git a/lib/ssh/test/ssh_to_openssh_SUITE_data/ssh_host_rsa_key b/lib/ssh/test/ssh_to_openssh_SUITE_data/ssh_host_rsa_key
new file mode 100644
index 0000000000..79968bdd7d
--- /dev/null
+++ b/lib/ssh/test/ssh_to_openssh_SUITE_data/ssh_host_rsa_key
@@ -0,0 +1,16 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQDCZX+4FBDwZIh9y/Uxee1VJnEXlowpz2yDKwj8semM4q843337
+zbNfxHmladB1lpz2NqyxI175xMIJuDxogyZdsOxGnFAzAnthR4dqL/RWRWzjaxSB
+6IAO9SPYVVlrpZ+1hsjLW79fwXK/yc8VdhRuWTeQiRgYY2ek8+OKbOqz4QIDAQAB
+AoGANmvJzJO5hkLuvyDZHKfAnGTtpifcR1wtSa9DjdKUyn8vhKF0mIimnbnYQEmW
+NUUb3gXCZLi9PvkpRSVRrASDOZwcjoU/Kvww163vBUVb2cOZfFhyn6o2Sk88Tt++
+udH3hdjpf9i7jTtUkUe+QYPsia+wgvvrmn4QrahLAH86+kECQQDx5gFeXTME3cnW
+WMpFz3PPumduzjqgqMMWEccX4FtQkMX/gyGa5UC7OHFyh0N/gSWvPbRHa8A6YgIt
+n8DO+fh5AkEAzbqX4DOn8NY6xJIi42q7l/2jIA0RkB6P7YugW5NblhqBZ0XDnpA5
+sMt+rz+K07u9XZtxgh1xi7mNfwY6lEAMqQJBAJBEauCKmRj35Z6OyeQku59SPsnY
++SJEREVvSNw2lH9SOKQQ4wPsYlTGbvKtNVZgAcen91L5MmYfeckYE/fdIZECQQCt
+64zxsTnM1I8iFxj/gP/OYlJBikrKt8udWmjaghzvLMEw+T2DExJyb9ZNeT53+UMB
+m6O+B/4xzU/djvp+0hbhAkAemIt+rA5kTmYlFndhpvzkSSM8a2EXsO4XIPgGWCTT
+tQKS/tTly0ADMjN/TVy11+9d6zcqadNVuHXHGtR4W0GR
+-----END RSA PRIVATE KEY-----
+
diff --git a/lib/ssh/test/ssh_to_openssh_SUITE_data/ssh_host_rsa_key.pub b/lib/ssh/test/ssh_to_openssh_SUITE_data/ssh_host_rsa_key.pub
new file mode 100644
index 0000000000..75d2025c71
--- /dev/null
+++ b/lib/ssh/test/ssh_to_openssh_SUITE_data/ssh_host_rsa_key.pub
@@ -0,0 +1,5 @@
+---- BEGIN SSH2 PUBLIC KEY ----
+AAAAB3NzaC1yc2EAAAADAQABAAAAgQDCZX+4FBDwZIh9y/Uxee1VJnEXlowpz2yDKwj8
+semM4q843337zbNfxHmladB1lpz2NqyxI175xMIJuDxogyZdsOxGnFAzAnthR4dqL/RW
+RWzjaxSB6IAO9SPYVVlrpZ+1hsjLW79fwXK/yc8VdhRuWTeQiRgYY2ek8+OKbOqz4Q==
+---- END SSH2 PUBLIC KEY ----