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_renegotiate_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_renegotiate_SUITE.erl')
| -rw-r--r-- | lib/ssh/test/ssh_renegotiate_SUITE.erl | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/ssh/test/ssh_renegotiate_SUITE.erl b/lib/ssh/test/ssh_renegotiate_SUITE.erl index 6d2c97aa68..abbe57796f 100644 --- a/lib/ssh/test/ssh_renegotiate_SUITE.erl +++ b/lib/ssh/test/ssh_renegotiate_SUITE.erl @@ -31,7 +31,7 @@ %%-------------------------------------------------------------------- suite() -> [{ct_hooks,[ts_install_cth]}, - {timetrap,{minutes,12}}]. + {timetrap,{seconds,40}}]. all() -> [{group,default_algs}, @@ -83,7 +83,8 @@ end_per_testcase(_TestCase, _Config) -> %%-------------------------------------------------------------------- %%% Idle timeout test - +rekey() -> [{timetrap,{seconds,90}}]. + rekey(Config) -> {Pid, Host, Port} = ssh_test_lib:std_daemon(Config, @@ -105,6 +106,8 @@ rekey(Config) -> %%% Test rekeying by data volume +rekey_limit() -> [{timetrap,{seconds,400}}]. + rekey_limit(Config) -> UserDir = ?config(priv_dir, Config), DataFile = filename:join(UserDir, "rekey.data"), |