diff options
| author | Hans Nilsson <[email protected]> | 2016-04-13 12:44:27 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2016-04-29 13:17:52 +0200 |
| commit | 0977a597432d018ff0edb3895a32f78a08647b85 (patch) | |
| tree | 278653ff2c230e757652b2b88b69c37720076d2a /lib | |
| parent | f6f2e1dd44b8de44f9a6420ab9ca8b358674caee (diff) | |
| download | otp-0977a597432d018ff0edb3895a32f78a08647b85.tar.gz otp-0977a597432d018ff0edb3895a32f78a08647b85.tar.bz2 otp-0977a597432d018ff0edb3895a32f78a08647b85.zip | |
ssh: adjusted timetrap values in ssh_to_openssh_SUITE
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ssh/test/ssh_algorithms_SUITE.erl | 2 | ||||
| -rw-r--r-- | lib/ssh/test/ssh_to_openssh_SUITE.erl | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/lib/ssh/test/ssh_algorithms_SUITE.erl b/lib/ssh/test/ssh_algorithms_SUITE.erl index 2e43399a5b..e6fc7662f9 100644 --- a/lib/ssh/test/ssh_algorithms_SUITE.erl +++ b/lib/ssh/test/ssh_algorithms_SUITE.erl @@ -192,7 +192,7 @@ simple_exec_groups_no_match_too_large(Config) -> %%-------------------------------------------------------------------- %% Testing all default groups -simple_exec_groups() -> [{timetrap,{seconds,180}}]. +simple_exec_groups() -> [{timetrap,{minutes,5}}]. simple_exec_groups(Config) -> Sizes = interpolate( public_key:dh_gex_group_sizes() ), diff --git a/lib/ssh/test/ssh_to_openssh_SUITE.erl b/lib/ssh/test/ssh_to_openssh_SUITE.erl index 3d3215a600..6132ff399e 100644 --- a/lib/ssh/test/ssh_to_openssh_SUITE.erl +++ b/lib/ssh/test/ssh_to_openssh_SUITE.erl @@ -34,7 +34,7 @@ %%-------------------------------------------------------------------- suite() -> - [{timetrap,{seconds,40}}]. + [{timetrap,{seconds,20}}]. all() -> case os:find_executable("ssh") of @@ -353,12 +353,14 @@ erlang_client_openssh_server_publickey_dsa(Config) when is_list(Config) -> %%-------------------------------------------------------------------- erlang_server_openssh_client_public_key_dsa() -> - [{doc, "Validate using dsa publickey."}]. + [{timetrap, {seconds,(?TIMEOUT div 1000)+10}}, + {doc, "Validate using dsa publickey."}]. erlang_server_openssh_client_public_key_dsa(Config) when is_list(Config) -> erlang_server_openssh_client_public_key_X(Config, ssh_dsa). erlang_server_openssh_client_public_key_rsa() -> - [{doc, "Validate using rsa publickey."}]. + [{timetrap, {seconds,(?TIMEOUT div 1000)+10}}, + {doc, "Validate using rsa publickey."}]. erlang_server_openssh_client_public_key_rsa(Config) when is_list(Config) -> erlang_server_openssh_client_public_key_X(Config, ssh_rsa). |