diff options
| author | Hans Nilsson <[email protected]> | 2018-04-19 14:39:17 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2018-04-19 14:39:17 +0200 |
| commit | c30309e799212b080c39ee2f91af3f9a0383d767 (patch) | |
| tree | 206f3174d1a1f78ed7668ec23401d1af0870cafb /lib/ssh | |
| parent | 0e831fff602e9c13471d4833a0e78c94020a86b6 (diff) | |
| parent | 231d5568b4bcd347144020508e66e31bf114258a (diff) | |
| download | otp-c30309e799212b080c39ee2f91af3f9a0383d767.tar.gz otp-c30309e799212b080c39ee2f91af3f9a0383d767.tar.bz2 otp-c30309e799212b080c39ee2f91af3f9a0383d767.zip | |
Merge branch 'hans/ssh/cuddle_tests'
* hans/ssh/cuddle_tests:
ssh: Declare serial for three test cases
ssh: Increase timetrap for slow test machines
Diffstat (limited to 'lib/ssh')
| -rw-r--r-- | lib/ssh/test/ssh_algorithms_SUITE.erl | 4 | ||||
| -rw-r--r-- | lib/ssh/test/ssh_basic_SUITE.erl | 2 | ||||
| -rw-r--r-- | lib/ssh/test/ssh_compat_SUITE.erl | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/lib/ssh/test/ssh_algorithms_SUITE.erl b/lib/ssh/test/ssh_algorithms_SUITE.erl index 0b18bee9d7..0ce4bd8699 100644 --- a/lib/ssh/test/ssh_algorithms_SUITE.erl +++ b/lib/ssh/test/ssh_algorithms_SUITE.erl @@ -35,7 +35,7 @@ suite() -> [{ct_hooks,[ts_install_cth]}, - {timetrap,{seconds,round(1.5*?TIMEOUT/1000)}}]. + {timetrap,{seconds,60}}]. all() -> %% [{group,kex},{group,cipher}... etc @@ -264,7 +264,7 @@ try_exec_simple_group(Group, Config) -> %% Testing all default groups simple_exec_groups() -> - [{timetrap,{seconds,120}}]. + [{timetrap,{seconds,180}}]. simple_exec_groups(Config) -> Sizes = interpolate( public_key:dh_gex_group_sizes() ), diff --git a/lib/ssh/test/ssh_basic_SUITE.erl b/lib/ssh/test/ssh_basic_SUITE.erl index d3f93c7382..1fa94bef11 100644 --- a/lib/ssh/test/ssh_basic_SUITE.erl +++ b/lib/ssh/test/ssh_basic_SUITE.erl @@ -106,12 +106,12 @@ groups() -> ]}, {basic, [], [{group,p_basic}, + shell, shell_no_unicode, shell_unicode_string, close, known_hosts ]}, {p_basic, [parallel], [send, peername_sockname, exec, exec_compressed, - shell, shell_no_unicode, shell_unicode_string, cli, idle_time_client, idle_time_server, openssh_zlib_basic_test, misc_ssh_options, inet_option, inet6_option]} diff --git a/lib/ssh/test/ssh_compat_SUITE.erl b/lib/ssh/test/ssh_compat_SUITE.erl index f7eda1dc08..6c0e010bf5 100644 --- a/lib/ssh/test/ssh_compat_SUITE.erl +++ b/lib/ssh/test/ssh_compat_SUITE.erl @@ -41,8 +41,7 @@ %%-------------------------------------------------------------------- suite() -> - [%%{ct_hooks,[ts_install_cth]}, - {timetrap,{seconds,40}}]. + [{timetrap,{seconds,60}}]. all() -> %% [check_docker_present] ++ |