From 4b6b59d957615a68f8184ad073ff3928ef59f678 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Thu, 29 Mar 2018 11:51:54 +0200
Subject: ssh: Increase timetrap for slow test machines

---
 lib/ssh/test/ssh_algorithms_SUITE.erl | 4 ++--
 lib/ssh/test/ssh_compat_SUITE.erl     | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/ssh/test/ssh_algorithms_SUITE.erl b/lib/ssh/test/ssh_algorithms_SUITE.erl
index 0b18bee9d7..0ce4bd8699 100644
--- a/lib/ssh/test/ssh_algorithms_SUITE.erl
+++ b/lib/ssh/test/ssh_algorithms_SUITE.erl
@@ -35,7 +35,7 @@
 
 suite() ->
     [{ct_hooks,[ts_install_cth]},
-     {timetrap,{seconds,round(1.5*?TIMEOUT/1000)}}].
+     {timetrap,{seconds,60}}].
 
 all() -> 
     %% [{group,kex},{group,cipher}... etc
@@ -264,7 +264,7 @@ try_exec_simple_group(Group, Config) ->
 %% Testing all default groups
 
 simple_exec_groups() ->
-    [{timetrap,{seconds,120}}].
+    [{timetrap,{seconds,180}}].
     
 simple_exec_groups(Config) ->
     Sizes = interpolate( public_key:dh_gex_group_sizes() ),
diff --git a/lib/ssh/test/ssh_compat_SUITE.erl b/lib/ssh/test/ssh_compat_SUITE.erl
index f7eda1dc08..6c0e010bf5 100644
--- a/lib/ssh/test/ssh_compat_SUITE.erl
+++ b/lib/ssh/test/ssh_compat_SUITE.erl
@@ -41,8 +41,7 @@
 %%--------------------------------------------------------------------
 
 suite() ->
-    [%%{ct_hooks,[ts_install_cth]},
-     {timetrap,{seconds,40}}].
+    [{timetrap,{seconds,60}}].
 
 all() ->
 %%    [check_docker_present] ++
-- 
cgit v1.2.3


From 231d5568b4bcd347144020508e66e31bf114258a Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Tue, 17 Apr 2018 15:54:57 +0200
Subject: ssh: Declare serial for three test cases

---
 lib/ssh/test/ssh_basic_SUITE.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/ssh/test/ssh_basic_SUITE.erl b/lib/ssh/test/ssh_basic_SUITE.erl
index d3f93c7382..1fa94bef11 100644
--- a/lib/ssh/test/ssh_basic_SUITE.erl
+++ b/lib/ssh/test/ssh_basic_SUITE.erl
@@ -106,12 +106,12 @@ groups() ->
                                           ]},
      
      {basic, [], [{group,p_basic},
+                  shell, shell_no_unicode, shell_unicode_string,
                   close, 
                   known_hosts
                  ]},
      {p_basic, [parallel], [send, peername_sockname,
                             exec, exec_compressed, 
-                            shell, shell_no_unicode, shell_unicode_string,
                             cli,
                             idle_time_client, idle_time_server, openssh_zlib_basic_test, 
                             misc_ssh_options, inet_option, inet6_option]}
-- 
cgit v1.2.3