File 0781-ssl-Test-cuddling.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0781-ssl-Test-cuddling.patch of Package erlang (Revision eecee6bca81667ccdc168e9e715f9a9a)

Currently displaying revision eecee6bca81667ccdc168e9e715f9a9a , Show latest

From 58821922fb6d161a8547a013841cf9512cdca26c Mon Sep 17 00:00:00 2001
From: Dan Gudmundsson <dgud@erlang.org>
Date: Thu, 15 Jun 2023 09:02:11 +0200
Subject: [PATCH 1/5] ssl: Test cuddling

Sync client starts to avoid failing testcase in client_unique_session.

Spawning client connects may give early parallell connections before
the first client have added it's session in to the db, so that next
client will not see it and create a new one.
---
 lib/ssl/test/ssl_session_cache_SUITE.erl | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/ssl/test/ssl_session_cache_SUITE.erl b/lib/ssl/test/ssl_session_cache_SUITE.erl
index 79f9a52317..9f0d614885 100644
--- a/lib/ssl/test/ssl_session_cache_SUITE.erl
+++ b/lib/ssl/test/ssl_session_cache_SUITE.erl
@@ -217,7 +217,7 @@ client_unique_session(Config) when is_list(Config) ->
 				   {options, ServerOpts}]),
     Port = ssl_test_lib:inet_port(Server),
     LastClient = clients_start(Server, ClientNode, Hostname, Port, ClientOpts, 20, []),
-    receive 
+    receive
 	{LastClient, {ok, _}} ->
 	    ok
     end,
@@ -227,10 +227,10 @@ client_unique_session(Config) when is_list(Config) ->
     ClientCache = element(2, State),
 
     1 = ?CLIENT_CB:size(ClientCache),
-  
+
     ssl_test_lib:close(Server, 500),
     ssl_test_lib:close(LastClient).
-		
+
 session_cleanup() ->
     [{doc, "Test that sessions are cleaned up eventually, so that the session table "
      "does not grow and grow ..."}].
@@ -560,8 +560,11 @@ clients_start(Server, ClientNode, Hostname, Port, ClientOpts, N, Opts) ->
     spawn_link(ssl_test_lib, start_client, 
 	       [[{node, ClientNode},
 		 {port, Port}, {host, Hostname},
-		 {mfa, {ssl_test_lib, no_result, []}},
+		 {mfa, {?MODULE, connection_info_result, []}},
 		 {from, self()},  {options, Opts ++ ClientOpts}]]),
+    receive  %% Sync client connect
+        {_, {ok, _}} -> ok
+    end,
     Server ! listen,
     wait_for_server(),
     clients_start(Server, ClientNode, Hostname, Port, ClientOpts, N-1, Opts).
-- 
2.35.3

Places

File 0781-ssl-Test-cuddling.patch of Package erlang (Revision eecee6bca81667ccdc168e9e715f9a9a)

Places