diff options
| author | Hans Nilsson <[email protected]> | 2017-11-30 18:04:44 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2017-12-21 15:31:44 +0100 |
| commit | 80633af75bb2c3f889d69cf22a0102bf5eaefe31 (patch) | |
| tree | 11793ff21c0617ac8635a7551dfb67824a6986d1 /lib/ssh/test/ssh_algorithms_SUITE.erl | |
| parent | fb60cf1408edc6ee03c7e391419367d047721809 (diff) | |
| download | otp-80633af75bb2c3f889d69cf22a0102bf5eaefe31.tar.gz otp-80633af75bb2c3f889d69cf22a0102bf5eaefe31.tar.bz2 otp-80633af75bb2c3f889d69cf22a0102bf5eaefe31.zip | |
ssh: Tests - timeout catches external ssh that does not disconnect
Diffstat (limited to 'lib/ssh/test/ssh_algorithms_SUITE.erl')
| -rw-r--r-- | lib/ssh/test/ssh_algorithms_SUITE.erl | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/ssh/test/ssh_algorithms_SUITE.erl b/lib/ssh/test/ssh_algorithms_SUITE.erl index 98964a2c8a..22fa33ff4e 100644 --- a/lib/ssh/test/ssh_algorithms_SUITE.erl +++ b/lib/ssh/test/ssh_algorithms_SUITE.erl @@ -29,15 +29,13 @@ %% Note: This directive should only be used in test suites. -compile(export_all). --define(TIMEOUT, 35000). - %%-------------------------------------------------------------------- %% Common Test interface functions ----------------------------------- %%-------------------------------------------------------------------- suite() -> [{ct_hooks,[ts_install_cth]}, - {timetrap,{seconds,40}}]. + {timetrap,{seconds,round(1.5*?TIMEOUT/1000)}}]. all() -> %% [{group,kex},{group,cipher}... etc @@ -90,7 +88,7 @@ init_per_suite(Config) -> " -- Max num algorithms: ~p~n" ,[os:getenv("HOME"), init:get_argument(home), - os:cmd("ssh -V"), + ssh_test_lib:installed_ssh_version("TIMEOUT"), ssh:default_algorithms(), crypto:info_lib(), ssh_test_lib:default_algorithms(sshc), |