aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2018-06-05 13:06:52 +0200
committerHans Nilsson <[email protected]>2018-06-05 13:06:52 +0200
commit1002dd0444bd43353f33b03ab8fb0f19e57465dd (patch)
treecccef0651befb2840a8a80653673e0dc47d17316
parent0a95d9c3ba44d8824a0f9590bb301efec715cde0 (diff)
parent77f697bf1881fa7c11dc63621731f9b451d98173 (diff)
downloadotp-1002dd0444bd43353f33b03ab8fb0f19e57465dd.tar.gz
otp-1002dd0444bd43353f33b03ab8fb0f19e57465dd.tar.bz2
otp-1002dd0444bd43353f33b03ab8fb0f19e57465dd.zip
Merge branch 'hans/ssh/cuddle_tests'
* hans/ssh/cuddle_tests: ssh: Remove dubious pubkey setup
-rw-r--r--lib/ssh/test/ssh_algorithms_SUITE.erl13
1 files changed, 1 insertions, 12 deletions
diff --git a/lib/ssh/test/ssh_algorithms_SUITE.erl b/lib/ssh/test/ssh_algorithms_SUITE.erl
index 0ce4bd8699..3a5478f847 100644
--- a/lib/ssh/test/ssh_algorithms_SUITE.erl
+++ b/lib/ssh/test/ssh_algorithms_SUITE.erl
@@ -100,7 +100,7 @@ init_per_suite(Config) ->
ct:log("all() ->~n ~p.~n~ngroups()->~n ~p.~n",[all(),groups()]),
ssh:start(),
[{std_simple_sftp_size,25000} % Sftp transferred data size
- | setup_pubkey(Config)]
+ | Config]
end
).
@@ -459,17 +459,6 @@ pubkey_opts(Config) ->
{system_dir, SystemDir}].
-setup_pubkey(Config) ->
- DataDir = proplists:get_value(data_dir, Config),
- UserDir = proplists:get_value(priv_dir, Config),
- Keys =
- [ssh_test_lib:setup_dsa(DataDir, UserDir),
- ssh_test_lib:setup_rsa(DataDir, UserDir),
- ssh_test_lib:setup_ecdsa("256", DataDir, UserDir)
- ],
- ssh_test_lib:write_auth_keys(Keys, UserDir), % 'authorized_keys' shall contain ALL pub keys
- Config.
-
setup_pubkey(Alg, Config) ->
DataDir = proplists:get_value(data_dir, Config),
UserDir = proplists:get_value(priv_dir, Config),