Merge branch 'maint'

3 files changed, 47 insertions, 42 deletions

diff --git a/lib/ssh/test/ssh_options_SUITE.erl b/lib/ssh/test/ssh_options_SUITE.erl
index 60eae5a850..4cc12cbcbe 100644
--- a/lib/ssh/test/ssh_options_SUITE.erl
+++ b/lib/ssh/test/ssh_options_SUITE.erl
@@ -982,7 +982,14 @@ ssh_connect_negtimeout(Config, Parallel) ->
     ct:sleep(round(Factor * NegTimeOut)),
     
     case inet:sockname(Socket) of
-	{ok,_} -> ct:fail("Socket not closed");
+	{ok,_} -> 
+	    %% Give it another chance...
+	    ct:log("Sleep more...",[]),
+	    ct:sleep(round(Factor * NegTimeOut)),
+	    case inet:sockname(Socket) of
+		{ok,_} -> ct:fail("Socket not closed");
+		{error,_} -> ok
+	    end;
 	{error,_} -> ok
     end.
 
diff --git a/lib/ssh/test/ssh_test_lib.erl b/lib/ssh/test/ssh_test_lib.erl
index 7cd364a6dc..f93237f3e7 100644
--- a/lib/ssh/test/ssh_test_lib.erl
+++ b/lib/ssh/test/ssh_test_lib.erl
@@ -800,17 +800,37 @@ busy_wait(Nus, T0) ->
 %% get_kex_init - helper function to get key_exchange_init_msg
 
 get_kex_init(Conn) ->
+    Ref = make_ref(),
+    {ok,TRef} = timer:send_after(15000, {reneg_timeout,Ref}),
+    get_kex_init(Conn, Ref, TRef).
+
+get_kex_init(Conn, Ref, TRef) ->
     %% First, validate the key exchange is complete (StateName == connected)
-    {{connected,_},S} = sys:get_state(Conn),
-    %% Next, walk through the elements of the #state record looking
-    %% for the #ssh_msg_kexinit record. This method is robust against
-    %% changes to either record. The KEXINIT message contains a cookie
-    %% unique to each invocation of the key exchange procedure (RFC4253)
-    SL = tuple_to_list(S),
-    case lists:keyfind(ssh_msg_kexinit, 1, SL) of
-	false ->
-	    throw(not_found);
-	KexInit ->
-	    KexInit
-    end.
+    case sys:get_state(Conn) of
+	{{connected,_}, S} ->
+	    timer:cancel(TRef),
+	    %% Next, walk through the elements of the #state record looking
+	    %% for the #ssh_msg_kexinit record. This method is robust against
+	    %% changes to either record. The KEXINIT message contains a cookie
+	    %% unique to each invocation of the key exchange procedure (RFC4253)
+	    SL = tuple_to_list(S),
+	    case lists:keyfind(ssh_msg_kexinit, 1, SL) of
+		false ->
+		    throw(not_found);
+		KexInit ->
+		    KexInit
+	    end;
 
+	{OtherState, S} ->
+	    ct:log("Not in 'connected' state: ~p",[OtherState]),
+	    receive
+		{reneg_timeout,Ref} -> 
+		    ct:log("S = ~p", [S]),
+		    ct:fail(reneg_timeout)
+	    after 0 ->
+		    timer:sleep(100), % If renegotiation is complete we do not
+				      % want to exit on the reneg_timeout
+		    get_kex_init(Conn, Ref, TRef)
+	    end
+    end.
+    
diff --git a/lib/ssh/test/ssh_to_openssh_SUITE.erl b/lib/ssh/test/ssh_to_openssh_SUITE.erl
index f378188b8b..2c7fe7898f 100644
--- a/lib/ssh/test/ssh_to_openssh_SUITE.erl
+++ b/lib/ssh/test/ssh_to_openssh_SUITE.erl
@@ -110,7 +110,7 @@ init_per_testcase(erlang_client_openssh_server_publickey_dsa, Config) ->
 init_per_testcase(erlang_server_openssh_client_renegotiate, Config) ->
     case os:type() of
 	{unix,_} -> ssh:start(), Config;
-	Type -> ct:fail("Unsupported test on ~p",[Type])
+	Type -> {skip, io_lib:format("Unsupported test on ~p",[Type])}
     end;
 init_per_testcase(_TestCase, Config) ->
     ssh:start(),
@@ -153,7 +153,7 @@ erlang_shell_client_openssh_server(Config) when is_list(Config) ->
     IO = ssh_test_lib:start_io_server(),
     Shell = ssh_test_lib:start_shell(?SSH_DEFAULT_PORT, IO),
     IO ! {input, self(), "echo Hej\n"},
-    receive_hej(),
+    receive_data("Hej"),
     IO ! {input, self(), "exit\n"},
     receive_logout(),
     receive_normal_exit(Shell).
@@ -447,7 +447,7 @@ erlang_client_openssh_server_renegotiate(_Config) ->
     Ref = make_ref(),
     Parent = self(),
 
-%%    catch ssh_dbg:messages(fun(X,_) -> ct:log(X) end),
+    catch ssh_dbg:messages(fun(X,_) -> ct:log(X) end),
     Shell = 
 	spawn_link(
 	  fun() ->
@@ -477,12 +477,12 @@ erlang_client_openssh_server_renegotiate(_Config) ->
 	{error, Ref, Error} ->
 	    ct:fail("Error=~p",[Error]);
 	{ok, Ref, ConnectionRef} ->
-	    IO ! {input, self(), "echo Hej\n"},
-	    receive_hej(),
+	    IO ! {input, self(), "echo Hej1\n"},
+	    receive_data("Hej1"),
 	    Kex1 = ssh_test_lib:get_kex_init(ConnectionRef),
 	    ssh_connection_handler:renegotiate(ConnectionRef),
-	    IO ! {input, self(), "echo Hej\n"},
-	    receive_hej(),
+	    IO ! {input, self(), "echo Hej2\n"},
+	    receive_data("Hej2"),
 	    Kex2 = ssh_test_lib:get_kex_init(ConnectionRef),
 	    IO ! {input, self(), "exit\n"},
 	    receive_logout(),
@@ -545,28 +545,6 @@ erlang_client_openssh_server_nonexistent_subsystem(Config) when is_list(Config)
 %%--------------------------------------------------------------------
 %%% Internal functions -----------------------------------------------
 %%--------------------------------------------------------------------
-receive_hej() ->
-    receive
-	<<"Hej", _binary>> = Hej ->
-	    ct:log("Expected result: ~p~n", [Hej]);
-	<<"Hej\n", _binary>> = Hej ->
-	    ct:log("Expected result: ~p~n", [Hej]);
-	<<"Hej\r\n", _/binary>> = Hej ->
-	    ct:log("Expected result: ~p~n", [Hej]);
-	Info ->
-	    Lines = binary:split(Info, [<<"\r\n">>], [global]),
-	    case lists:member(<<"Hej">>, Lines) of
-		true ->
-		    ct:log("Expected result found in lines: ~p~n", [Lines]),
-		    ok;
-		false ->
-		    ct:log("Extra info: ~p~n", [Info]),
-		    receive_hej()
-	    end
-    after 
-	30000 -> ct:fail("timeout ~p:~p",[?MODULE,?LINE])
-    end.
-
 receive_data(Data) ->
     receive
 	Info when is_binary(Info) ->