diff options
| author | Hans <[email protected]> | 2015-05-26 15:10:24 +0200 |
|---|---|---|
| committer | Hans <[email protected]> | 2015-05-26 15:10:24 +0200 |
| commit | 42dd87320c1197501b7f1ca864eb5515a2c9ba41 (patch) | |
| tree | 34b7ea8d1ced951e5b5f6fa0cd2fbe1c0841b853 /lib/ssh/test/ssh_to_openssh_SUITE.erl | |
| parent | af51a9165b53cbbeae7428630299f82f0271dae0 (diff) | |
| parent | 946425be714a72b1dec0a67966679ef7a5c3e39d (diff) | |
| download | otp-42dd87320c1197501b7f1ca864eb5515a2c9ba41.tar.gz otp-42dd87320c1197501b7f1ca864eb5515a2c9ba41.tar.bz2 otp-42dd87320c1197501b7f1ca864eb5515a2c9ba41.zip | |
Merge branch 'hans/ssh/configurable_cipher/OTP-12029'
* hans/ssh/configurable_cipher/OTP-12029:
ssh: Algorithms test case added
ssh: Undocumented option 'compression' replaced by 'preferred_algorithms'
ssh: New option 'preferred_algorithms'
ssh: Remove erroneous option 'role'
Diffstat (limited to 'lib/ssh/test/ssh_to_openssh_SUITE.erl')
| -rw-r--r-- | lib/ssh/test/ssh_to_openssh_SUITE.erl | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/ssh/test/ssh_to_openssh_SUITE.erl b/lib/ssh/test/ssh_to_openssh_SUITE.erl index a61fd2dd41..277e3a1b08 100644 --- a/lib/ssh/test/ssh_to_openssh_SUITE.erl +++ b/lib/ssh/test/ssh_to_openssh_SUITE.erl @@ -60,6 +60,7 @@ groups() -> ]. init_per_suite(Config) -> + catch crypto:stop(), case catch crypto:start() of ok -> case gen_tcp:connect("localhost", 22, []) of @@ -166,9 +167,11 @@ erlang_client_openssh_server_exec_compressed() -> [{doc, "Test that compression option works"}]. erlang_client_openssh_server_exec_compressed(Config) when is_list(Config) -> + CompressAlgs = [zlib, '[email protected]',none], ConnectionRef = ssh_test_lib:connect(?SSH_DEFAULT_PORT, [{silently_accept_hosts, true}, {user_interaction, false}, - {compression, zlib}]), + {preferred_algorithms, + [{compression,CompressAlgs}]}]), {ok, ChannelId} = ssh_connection:session_channel(ConnectionRef, infinity), success = ssh_connection:exec(ConnectionRef, ChannelId, "echo testing", infinity), @@ -326,8 +329,11 @@ erlang_server_openssh_client_exec_compressed(Config) when is_list(Config) -> PrivDir = ?config(priv_dir, Config), KnownHosts = filename:join(PrivDir, "known_hosts"), +%% CompressAlgs = [zlib, '[email protected]'], % Does not work + CompressAlgs = [zlib], {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SystemDir}, - {compression, zlib}, + {preferred_algorithms, + [{compression, CompressAlgs}]}, {failfun, fun ssh_test_lib:failfun/2}]), ct:sleep(500), |