diff options
| author | Hans Nilsson <[email protected]> | 2015-02-05 10:55:17 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2015-02-05 10:55:17 +0100 |
| commit | 6cdbe4b9a3bb89d02f4d4f5cd513615d19191b5d (patch) | |
| tree | c63239c4c0a3eded367de3fa89c4c0aaad0d6d7f /lib | |
| parent | 280399ccfc3c4bd0e9c87c22bfc13045aae2bb76 (diff) | |
| parent | ba3bd714f1c09e8bd8db0253ac18021cfabee28f (diff) | |
| download | otp-6cdbe4b9a3bb89d02f4d4f5cd513615d19191b5d.tar.gz otp-6cdbe4b9a3bb89d02f4d4f5cd513615d19191b5d.tar.bz2 otp-6cdbe4b9a3bb89d02f4d4f5cd513615d19191b5d.zip | |
Merge branch 'hans/ssh/error_timeout/OTP-12369' into maint
* hans/ssh/error_timeout/OTP-12369:
Fix ssh:connect erroneus error msg at timeout
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ssh/src/ssh_connection_handler.erl | 2 | ||||
| -rw-r--r-- | lib/ssh/test/ssh_basic_SUITE.erl | 7 |
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 |