diff options
| author | Hans Nilsson <[email protected]> | 2015-02-05 10:55:54 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2015-02-05 10:55:54 +0100 |
| commit | 9f6f29e5c58ab9e39a4de3142c9670c925734130 (patch) | |
| tree | 4f11f92b8bc9b3c0f5618a11d1c0f47bd75eccaf /lib/ssh/test | |
| parent | ae5d5db20fe1d9b4cae2a19717ef010be1b8097f (diff) | |
| parent | 6cdbe4b9a3bb89d02f4d4f5cd513615d19191b5d (diff) | |
| download | otp-9f6f29e5c58ab9e39a4de3142c9670c925734130.tar.gz otp-9f6f29e5c58ab9e39a4de3142c9670c925734130.tar.bz2 otp-9f6f29e5c58ab9e39a4de3142c9670c925734130.zip | |
Merge branch 'maint'
* maint:
Fix ssh:connect erroneus error msg at timeout
Diffstat (limited to 'lib/ssh/test')
| -rw-r--r-- | lib/ssh/test/ssh_basic_SUITE.erl | 7 |
1 files changed, 6 insertions, 1 deletions
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 |