diff options
| author | Ingela Anderton Andin <[email protected]> | 2012-02-28 10:29:24 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2012-02-28 10:29:24 +0100 |
| commit | bc50e697fbf392c99842d823eb67a564e1759376 (patch) | |
| tree | ccf3969614c01cf2b2c24f2942529ccb570bf096 /lib/ssh/test/ssh_to_openssh_SUITE.erl | |
| parent | d9ee75fa3df8676deb92136c38b65e928cde196e (diff) | |
| parent | 1aeb8f4234b52705f9a933abf8dcd1afb2296b9d (diff) | |
| download | otp-bc50e697fbf392c99842d823eb67a564e1759376.tar.gz otp-bc50e697fbf392c99842d823eb67a564e1759376.tar.bz2 otp-bc50e697fbf392c99842d823eb67a564e1759376.zip | |
Merge branch 'ia/ssh/error-handling' into maint
* ia/ssh/error-handling:
Prevent client hanging. (OTP-8111)
Added checks of API input
Improve check so that we will not try to read ssh packet length indicator if not sure we have enough data.
Improved error handling
Diffstat (limited to 'lib/ssh/test/ssh_to_openssh_SUITE.erl')
| -rw-r--r-- | lib/ssh/test/ssh_to_openssh_SUITE.erl | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/ssh/test/ssh_to_openssh_SUITE.erl b/lib/ssh/test/ssh_to_openssh_SUITE.erl index dfe526564d..c337617ee4 100644 --- a/lib/ssh/test/ssh_to_openssh_SUITE.erl +++ b/lib/ssh/test/ssh_to_openssh_SUITE.erl @@ -445,7 +445,7 @@ erlang_client_openssh_server_password(Config) when is_list(Config) -> %% to make sure we don't public-key-auth UserDir = ?config(data_dir, Config), {error, Reason0} = - ssh_test_lib:connect(?SSH_DEFAULT_PORT, [{silently_accept_hosts, true}, + ssh:connect(any, ?SSH_DEFAULT_PORT, [{silently_accept_hosts, true}, {user, "foo"}, {password, "morot"}, {user_interaction, false}, @@ -459,12 +459,12 @@ erlang_client_openssh_server_password(Config) when is_list(Config) -> case length(string:tokens(User, " ")) of 1 -> {error, Reason1} = - ssh_test_lib:connect(?SSH_DEFAULT_PORT, - [{silently_accept_hosts, true}, - {user, User}, - {password, "foo"}, - {user_interaction, false}, - {user_dir, UserDir}]), + ssh:connect(any, ?SSH_DEFAULT_PORT, + [{silently_accept_hosts, true}, + {user, User}, + {password, "foo"}, + {user_interaction, false}, + {user_dir, UserDir}]), test_server:format("Test of wrong Pasword. " "Error msg: ~p~n", [Reason1]); _ -> |