From 449e66a2676f4607f43a4e70b3dcad99b9d45a78 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Tue, 8 Mar 2016 12:14:39 +0100
Subject: Set timetrap to 40s except for some long running test cases

Conflicts:
	lib/ssh/test/ssh_connection_SUITE.erl
---
 lib/ssh/test/ssh_algorithms_SUITE.erl | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'lib/ssh/test/ssh_algorithms_SUITE.erl')

diff --git a/lib/ssh/test/ssh_algorithms_SUITE.erl b/lib/ssh/test/ssh_algorithms_SUITE.erl
index 49ed15698c..256c8c8da3 100644
--- a/lib/ssh/test/ssh_algorithms_SUITE.erl
+++ b/lib/ssh/test/ssh_algorithms_SUITE.erl
@@ -36,7 +36,7 @@
 
 suite() ->
     [{ct_hooks,[ts_install_cth]},
-     {timetrap,{minutes,10}}].
+     {timetrap,{seconds,40}}].
 
 all() -> 
     %% [{group,kex},{group,cipher}... etc
@@ -191,6 +191,9 @@ simple_exec_groups_no_match_too_large(Config) ->
 
 %%--------------------------------------------------------------------
 %% Testing all default groups
+
+simple_exec_groups() -> [{timetrap,{seconds,90}}].
+
 simple_exec_groups(Config) ->
     Sizes = interpolate( public_key:dh_gex_group_sizes() ),
     lists:foreach(
@@ -217,6 +220,9 @@ 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"),
-- 
cgit v1.2.3