File 4971-ssh-attempt-to-reduce-timetraps-in-ssh.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 4971-ssh-attempt-to-reduce-timetraps-in-ssh.patch of Package erlang

From 506ec86bcecf17c4a8f9f6e29bf9e7f51a3efda7 Mon Sep 17 00:00:00 2001
From: Jakub Witczak <kuba@erlang.org>
Date: Thu, 17 Oct 2024 10:54:48 +0200
Subject: [PATCH] ssh: attempt to reduce timetraps in ssh

---
 lib/ssh/test/ssh_options_SUITE.erl         | 4 ++--
 lib/ssh/test/ssh_pubkey_SUITE.erl          | 2 +-
 lib/ssh/test/ssh_sftp_SUITE.erl            | 4 ++--
 lib/ssh/test/ssh_sftpd_SUITE.erl           | 4 ++--
 lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl | 2 +-
 lib/ssh/test/ssh_sup_SUITE.erl             | 2 +-
 lib/ssh/test/ssh_test_lib.hrl              | 2 +-
 lib/ssh/test/ssh_to_openssh_SUITE.erl      | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib/ssh/test/ssh_options_SUITE.erl b/lib/ssh/test/ssh_options_SUITE.erl
index e1ea3aae85..0017570ff6 100644
--- a/lib/ssh/test/ssh_options_SUITE.erl
+++ b/lib/ssh/test/ssh_options_SUITE.erl
@@ -110,7 +110,7 @@
 
 suite() ->
     [{ct_hooks,[ts_install_cth]},
-     {timetrap,{seconds,60}}].
+     {timetrap,{seconds,15}}].
 
 all() -> 
     [connectfun_disconnectfun_server,
@@ -1563,7 +1563,7 @@ try_to_connect(Connect, Host, Port, Pid, Tref, N) ->
 
 %%--------------------------------------------------------------------
 max_sessions_drops_tcp_connects() ->
-    [{timetrap,{minutes,20}}].
+    [{timetrap,{minutes,2}}].
 
 max_sessions_drops_tcp_connects(Config) ->
     MaxSessions = 20,
diff --git a/lib/ssh/test/ssh_pubkey_SUITE.erl b/lib/ssh/test/ssh_pubkey_SUITE.erl
index 7eca2619db..4dcc91aa9d 100644
--- a/lib/ssh/test/ssh_pubkey_SUITE.erl
+++ b/lib/ssh/test/ssh_pubkey_SUITE.erl
@@ -99,7 +99,7 @@
 
 suite() ->
     [{ct_hooks,[ts_install_cth]},
-     {timetrap,{seconds,40}}].
+     {timetrap,{seconds,20}}].
 
 all() -> 
     [{group, old_format},
diff --git a/lib/ssh/test/ssh_sftp_SUITE.erl b/lib/ssh/test/ssh_sftp_SUITE.erl
index 2560f808c8..1acbc8411c 100644
--- a/lib/ssh/test/ssh_sftp_SUITE.erl
+++ b/lib/ssh/test/ssh_sftp_SUITE.erl
@@ -83,7 +83,7 @@
 -include("ssh_test_lib.hrl").
 -include_lib("stdlib/include/assert.hrl").
 %% Default timetrap timeout
--define(default_timeout, test_server:minutes(1)).
+-define(default_timeout, test_server:minutes(0.5)).
 
 %%--------------------------------------------------------------------
 %% Common Test interface functions -----------------------------------
@@ -91,7 +91,7 @@
 
 suite() ->
     [{ct_hooks,[ts_install_cth]},
-     {timetrap,{seconds,40}}].
+     {timetrap,{seconds,20}}].
 
 all() -> 
     [{group, not_unicode},
diff --git a/lib/ssh/test/ssh_sftpd_SUITE.erl b/lib/ssh/test/ssh_sftpd_SUITE.erl
index 42677b7613..3c69da889b 100644
--- a/lib/ssh/test/ssh_sftpd_SUITE.erl
+++ b/lib/ssh/test/ssh_sftpd_SUITE.erl
@@ -68,7 +68,7 @@
 -define(PASSWD, "Sesame").
 %% -define(XFER_PACKET_SIZE, 32768).
 %% -define(XFER_WINDOW_SIZE, 4*?XFER_PACKET_SIZE).
--define(SSH_TIMEOUT, 10000).
+-define(SSH_TIMEOUT, 5000).
 -define(REG_ATTERS, <<0,0,0,0,1>>).
 -define(UNIX_EPOCH,  62167219200).
 
@@ -80,7 +80,7 @@
 %%--------------------------------------------------------------------
 
 suite() ->
-    [{timetrap,{seconds,40}}].
+    [{timetrap,{seconds,20}}].
 
 all() -> 
     [open_close_file, 
diff --git a/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl b/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl
index d8971643f0..3d664b6f8b 100644
--- a/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl
+++ b/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl
@@ -56,7 +56,7 @@
 
 suite() ->
     [{ct_hooks,[ts_install_cth]},
-     {timetrap,{seconds,40}}].
+     {timetrap,{seconds,20}}].
 
 all() -> 
     [close_file, 
diff --git a/lib/ssh/test/ssh_sup_SUITE.erl b/lib/ssh/test/ssh_sup_SUITE.erl
index e6245d65f1..1263538959 100644
--- a/lib/ssh/test/ssh_sup_SUITE.erl
+++ b/lib/ssh/test/ssh_sup_SUITE.erl
@@ -61,7 +61,7 @@
 %%--------------------------------------------------------------------
 suite() ->
     [{ct_hooks,[ts_install_cth]},
-     {timetrap,{seconds,100}}].
+     {timetrap,{seconds,50}}].
 
 all() ->
     [default_tree, sshc_subtree, sshd_subtree, sshd_subtree_profile,
diff --git a/lib/ssh/test/ssh_test_lib.hrl b/lib/ssh/test/ssh_test_lib.hrl
index ade4174a71..aa98a952a8 100644
--- a/lib/ssh/test/ssh_test_lib.hrl
+++ b/lib/ssh/test/ssh_test_lib.hrl
@@ -9,7 +9,7 @@
 %%-------------------------------------------------------------------------
 %% Timeout time in ms
 %%-------------------------------------------------------------------------
--define(TIMEOUT, 27000).
+-define(TIMEOUT, 15000).
 
 %%-------------------------------------------------------------------------
 %% Check for usable crypto
diff --git a/lib/ssh/test/ssh_to_openssh_SUITE.erl b/lib/ssh/test/ssh_to_openssh_SUITE.erl
index a2eb5880ce..183034f985 100644
--- a/lib/ssh/test/ssh_to_openssh_SUITE.erl
+++ b/lib/ssh/test/ssh_to_openssh_SUITE.erl
@@ -60,7 +60,7 @@
 %%--------------------------------------------------------------------
 
 suite() ->
-    [{timetrap,{seconds,60}}].
+    [{timetrap,{seconds,30}}].
 
 all() -> 
     case os:find_executable("ssh") of
-- 
2.43.0

Places

File 4971-ssh-attempt-to-reduce-timetraps-in-ssh.patch of Package erlang

Places