Merge branch 'maint'

* maint:
  Fix ssh:connect erroneus error msg at timeout

2 files changed, 7 insertions, 2 deletions

diff --git a/lib/ssh/src/ssh_connection_handler.erl b/lib/ssh/src/ssh_connection_handler.erl
index 915060c426..68523aa72b 100644
--- a/lib/ssh/src/ssh_connection_handler.erl
+++ b/lib/ssh/src/ssh_connection_handler.erl
@@ -1711,7 +1711,7 @@ handshake(Pid, Ref, Timeout) ->
 	    {error, Reason}
     after Timeout ->
 	    stop(Pid),
-	    {error, Timeout}
+	    {error, timeout}
     end.
 
 start_timeout(_,_, infinity) ->
diff --git a/lib/ssh/test/ssh_basic_SUITE.erl b/lib/ssh/test/ssh_basic_SUITE.erl
index 415cb9fc9c..cb1b4ae945 100644
--- a/lib/ssh/test/ssh_basic_SUITE.erl
+++ b/lib/ssh/test/ssh_basic_SUITE.erl
@@ -723,7 +723,7 @@ ssh_connect_arg4_timeout(_Config) ->
 
     %% Wait for client reaction on the connection try:
     receive
-	{done, Client, {error,_E}, T0} ->
+	{done, Client, {error,timeout}, T0} ->
 	    Msp = ms_passed(T0, now()),
 	    exit(Server,hasta_la_vista___baby),
 	    Low = 0.9*Timeout,
@@ -733,6 +733,11 @@ ssh_connect_arg4_timeout(_Config) ->
 		Low<Msp, Msp<High -> ok;
 		true -> {fail, "timeout not within limits"}
 	    end;
+
+	{done, Client, {error,Other}, _T0} ->
+	    ct:log("Error message \"~p\" from the client is unexpected.",[{error,Other}]),
+	    {fail, "Unexpected error message"};
+
 	{done, Client, {ok,_Ref}, _T0} ->
 	    {fail,"ssh-connected ???"}
     after