diff options
| author | Hans Nilsson <[email protected]> | 2017-12-22 16:15:37 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2017-12-22 16:15:37 +0100 |
| commit | 0c08677522f1add0f6161328a0009e3ac3401f1e (patch) | |
| tree | bd94782c4588d6b9b8b2480e4dad38c38e627065 /lib/ssh/test/ssh_algorithms_SUITE.erl | |
| parent | 9cfb523632b6ed2b5e04bec5c67ede70875ca931 (diff) | |
| parent | 4ec9ee4fc8893b526f1686da66b90bdf69f8f343 (diff) | |
| download | otp-0c08677522f1add0f6161328a0009e3ac3401f1e.tar.gz otp-0c08677522f1add0f6161328a0009e3ac3401f1e.tar.bz2 otp-0c08677522f1add0f6161328a0009e3ac3401f1e.zip | |
Merge branch 'hans/ssh/cuddle_ssh_test' into maint
* hans/ssh/cuddle_ssh_test:
ssh: Better reports in some test case failures
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 | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/ssh/test/ssh_algorithms_SUITE.erl b/lib/ssh/test/ssh_algorithms_SUITE.erl index 98964a2c8a..de6e448ebd 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), @@ -318,10 +316,10 @@ sshc_simple_exec_os_cmd(Config) -> ok; false -> ct:log("Bad result: ~p~nExpected: ~p~nMangled result: ~p", [RawResult,Expect,Lines]), - {fail, "Bad result"} + {fail, "Bad result (see log in testcase)"} end after ?TIMEOUT -> - ct:fail("Did not receive answer") + ct:fail("Did not receive answer (timeout)") end. %%-------------------------------------------------------------------- |