diff options
| author | Hans Nilsson <hans@erlang.org> | 2016-03-22 12:23:00 +0100 |
|---|---|---|
| committer | Hans Nilsson <hans@erlang.org> | 2016-03-22 12:23:00 +0100 |
| commit | 59f8b16d04ef738097564d3a33cd6f67949a3742 (patch) | |
| tree | c851caa7be3d5974dfb36a2710222d6a2bafc735 /lib/ssh/test/ssh_algorithms_SUITE.erl | |
| parent | 6032030a1248514d277f15e0c3d4bed3298f9f8a (diff) | |
| download | erlang-59f8b16d04ef738097564d3a33cd6f67949a3742.tar.gz | |
ssh: Increase timetrap for GEX
Diffstat (limited to 'lib/ssh/test/ssh_algorithms_SUITE.erl')
| -rw-r--r-- | lib/ssh/test/ssh_algorithms_SUITE.erl | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/ssh/test/ssh_algorithms_SUITE.erl b/lib/ssh/test/ssh_algorithms_SUITE.erl index 094c9d406d..2dc228a3cf 100644 --- a/lib/ssh/test/ssh_algorithms_SUITE.erl +++ b/lib/ssh/test/ssh_algorithms_SUITE.erl @@ -28,7 +28,7 @@ %% Note: This directive should only be used in test suites. -compile(export_all). --define(TIMEOUT, 50000). +-define(TIMEOUT, 10000). %%-------------------------------------------------------------------- %% Common Test interface functions ----------------------------------- @@ -192,7 +192,7 @@ simple_exec_groups_no_match_too_large(Config) -> %%-------------------------------------------------------------------- %% Testing all default groups -simple_exec_groups() -> [{timetrap,{seconds,90}}]. +simple_exec_groups() -> [{timetrap,{seconds,180}}]. simple_exec_groups(Config) -> Sizes = interpolate( public_key:dh_gex_group_sizes() ), @@ -221,8 +221,6 @@ interpolate(Is) -> %%-------------------------------------------------------------------- %% Use the ssh client of the OS to connect -sshc_simple_exec() -> [{timetrap,{seconds,90}}]. - sshc_simple_exec(Config) -> PrivDir = ?config(priv_dir, Config), KnownHosts = filename:join(PrivDir, "known_hosts"), @@ -243,10 +241,11 @@ rcv_expected(SshPort, Expect) -> catch port_close(SshPort), ok; Other -> - ct:log("Got UNEXPECTED ~p",[Expect]), + ct:log("Got UNEXPECTED ~p",[Other]), rcv_expected(SshPort, Expect) after ?TIMEOUT -> + catch port_close(SshPort), ct:fail("Did not receive answer") end. |