aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/test/ssh_basic_SUITE.erl
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2015-05-20 14:02:32 +0200
committerHans <[email protected]>2015-05-26 15:08:26 +0200
commit12f96d2a414bb44c0c5268bc18741f6bad9bbe09 (patch)
tree7954a27878bdd1b955b0bdb497f809aa93d42f38 /lib/ssh/test/ssh_basic_SUITE.erl
parente5715f37dcfd9c21103232e699390d9736180923 (diff)
downloadotp-12f96d2a414bb44c0c5268bc18741f6bad9bbe09.tar.gz
otp-12f96d2a414bb44c0c5268bc18741f6bad9bbe09.tar.bz2
otp-12f96d2a414bb44c0c5268bc18741f6bad9bbe09.zip
ssh: Undocumented option 'compression' replaced by 'preferred_algorithms'
The 'compression' option was used in the test cases. The new option 'preferred_algorithms' is much more powerful and can be used as a replacement.
Diffstat (limited to 'lib/ssh/test/ssh_basic_SUITE.erl')
-rw-r--r--lib/ssh/test/ssh_basic_SUITE.erl6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/ssh/test/ssh_basic_SUITE.erl b/lib/ssh/test/ssh_basic_SUITE.erl
index aaf0fa9905..e9002b8bfe 100644
--- a/lib/ssh/test/ssh_basic_SUITE.erl
+++ b/lib/ssh/test/ssh_basic_SUITE.erl
@@ -92,6 +92,7 @@ basic_tests() ->
%%--------------------------------------------------------------------
init_per_suite(Config) ->
+ catch crypto:stop(),
case catch crypto:start() of
ok ->
Config;
@@ -289,7 +290,7 @@ exec_compressed(Config) when is_list(Config) ->
UserDir = ?config(priv_dir, Config),
{Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SystemDir},{user_dir, UserDir},
- {compression, zlib},
+ {preferred_algorithms,[{compression, [zlib]}]},
{failfun, fun ssh_test_lib:failfun/2}]),
ConnectionRef =
@@ -1238,7 +1239,8 @@ openssh_zlib_basic_test(Config) ->
ssh_test_lib:connect(Host, Port, [{silently_accept_hosts, true},
{user_dir, UserDir},
{user_interaction, false},
- {compression, openssh_zlib}]),
+ {preferred_algorithms,[{compression, ['[email protected]']}]}
+ ]),
ok = ssh:close(ConnectionRef),
ssh:stop_daemon(Pid).