aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/test/ssh_algorithms_SUITE.erl
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2015-10-20 14:11:24 +0200
committerHans Nilsson <[email protected]>2015-10-20 14:11:24 +0200
commit6ff5af590b43942b7ff95ec0a7f1b0b1be61c43a (patch)
treec2a93e5788edc1ab167a89d4b043b07a66ad47f5 /lib/ssh/test/ssh_algorithms_SUITE.erl
parent5ea9a240688f43f81eb607d79e4161f9085024e7 (diff)
parent51d3c765b0a681794e364921bce32da8ee0624c0 (diff)
downloadotp-6ff5af590b43942b7ff95ec0a7f1b0b1be61c43a.tar.gz
otp-6ff5af590b43942b7ff95ec0a7f1b0b1be61c43a.tar.bz2
otp-6ff5af590b43942b7ff95ec0a7f1b0b1be61c43a.zip
Merge branch 'maint'
* maint: ssh: Removed testcases from ssh_to_openssh_SUITE ssh: test suites probes ssh client ssh: running ssh_algorithms_SUITE tests in parallel ssh: wait for subsystem exit in ssh_connection_SUITE:max_channels_option
Diffstat (limited to 'lib/ssh/test/ssh_algorithms_SUITE.erl')
-rw-r--r--lib/ssh/test/ssh_algorithms_SUITE.erl5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/ssh/test/ssh_algorithms_SUITE.erl b/lib/ssh/test/ssh_algorithms_SUITE.erl
index 9f388de2a7..2ab83d84e1 100644
--- a/lib/ssh/test/ssh_algorithms_SUITE.erl
+++ b/lib/ssh/test/ssh_algorithms_SUITE.erl
@@ -58,7 +58,7 @@ groups() ->
],
AlgoTcSet =
- [{Alg, [], specific_test_cases(Tag,Alg,SshcAlgos,SshdAlgos)}
+ [{Alg, [parallel], specific_test_cases(Tag,Alg,SshcAlgos,SshdAlgos)}
|| {Tag,Algs} <- ErlAlgos ++ DoubleAlgos,
Alg <- Algs],
@@ -110,7 +110,8 @@ init_per_group(Group, Config) ->
Config;
false ->
%% An algorithm group
- [[{name,Tag}]|_] = ?config(tc_group_path, Config),
+ Tag = proplists:get_value(name,
+ hd(?config(tc_group_path, Config))),
Alg = Group,
PA =
case split(Alg) of