diff options
| author | Hans Nilsson <[email protected]> | 2016-03-08 12:14:39 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2016-03-18 14:40:47 +0100 |
| commit | 449e66a2676f4607f43a4e70b3dcad99b9d45a78 (patch) | |
| tree | f8285294fab4fc6aefd8c0876d5327d58a621c94 /lib/ssh/test/ssh_options_SUITE.erl | |
| parent | 586e8f0cb587355221ed8a24c4e8ca06e8404192 (diff) | |
| download | otp-449e66a2676f4607f43a4e70b3dcad99b9d45a78.tar.gz otp-449e66a2676f4607f43a4e70b3dcad99b9d45a78.tar.bz2 otp-449e66a2676f4607f43a4e70b3dcad99b9d45a78.zip | |
Set timetrap to 40s except for some long running test cases
Conflicts:
lib/ssh/test/ssh_connection_SUITE.erl
Diffstat (limited to 'lib/ssh/test/ssh_options_SUITE.erl')
| -rw-r--r-- | lib/ssh/test/ssh_options_SUITE.erl | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/lib/ssh/test/ssh_options_SUITE.erl b/lib/ssh/test/ssh_options_SUITE.erl index ba0107efd6..22a311df3c 100644 --- a/lib/ssh/test/ssh_options_SUITE.erl +++ b/lib/ssh/test/ssh_options_SUITE.erl @@ -51,8 +51,10 @@ ssh_connect_arg4_timeout/1, ssh_connect_negtimeout_parallel/1, ssh_connect_negtimeout_sequential/1, - ssh_connect_nonegtimeout_connected_parallel/1, - ssh_connect_nonegtimeout_connected_sequential/1, + ssh_connect_nonegtimeout_connected_parallel/0, + ssh_connect_nonegtimeout_connected_parallel/1, + ssh_connect_nonegtimeout_connected_sequential/0, + ssh_connect_nonegtimeout_connected_sequential/1, ssh_connect_timeout/1, connect/4, ssh_daemon_minimal_remote_max_packet_size_option/1, ssh_msg_debug_fun_option_client/1, @@ -80,7 +82,7 @@ suite() -> [{ct_hooks,[ts_install_cth]}, - {timetrap,{minutes,6}}]. + {timetrap,{seconds,40}}]. all() -> [connectfun_disconnectfun_server, @@ -980,10 +982,16 @@ ssh_connect_negtimeout(Config, Parallel) -> %%-------------------------------------------------------------------- %%% Test that ssh connection does not timeout if the connection is established (parallel) + +ssh_connect_nonegtimeout_connected_parallel() -> [{timetrap,{seconds,90}}]. + ssh_connect_nonegtimeout_connected_parallel(Config) -> ssh_connect_nonegtimeout_connected(Config, true). %%% Test that ssh connection does not timeout if the connection is established (non-parallel) + +ssh_connect_nonegtimeout_connected_sequential() -> [{timetrap,{seconds,90}}]. + ssh_connect_nonegtimeout_connected_sequential(Config) -> ssh_connect_nonegtimeout_connected(Config, false). |