File 1482-Fix-tests-for-inet_backend-socket.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1482-Fix-tests-for-inet_backend-socket.patch of Package erlang (Revision c698cd69bc2bea1d808e4837af05cc32)

Currently displaying revision c698cd69bc2bea1d808e4837af05cc32 , Show latest

From 9657eb547df68112ffb901baade6cb9b22379445 Mon Sep 17 00:00:00 2001
From: Raimo Niskanen <raimo@erlang.org>
Date: Wed, 25 Aug 2021 16:11:25 +0200
Subject: [PATCH 2/4] Fix tests for inet_backend = socket

---
 lib/kernel/test/gen_tcp_misc_SUITE.erl | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/lib/kernel/test/gen_tcp_misc_SUITE.erl b/lib/kernel/test/gen_tcp_misc_SUITE.erl
index 40dbeddccd..9f23ca5992 100644
--- a/lib/kernel/test/gen_tcp_misc_SUITE.erl
+++ b/lib/kernel/test/gen_tcp_misc_SUITE.erl
@@ -6459,7 +6459,7 @@ otp_12242(Config, Addr) when (tuple_size(Addr) =:= 4) ->
 			  ?P("close order received - close accepted socket"),
                           ok = gen_tcp:close(A)
                   end
-          end, [monitor]),
+          end, [link, monitor]),
     ?P("await listen port"),
     LPort = receive {Listener,port,P} -> P end,
     ?P("try connect to ~w", [LPort]),
@@ -6481,12 +6481,25 @@ otp_12242(Config, Addr) when (tuple_size(Addr) =:= 4) ->
     ok.
     
 
-otp_12242_2(C, Blob, Datasize) when is_port(C) ->
+otp_12242_2(C, Blob, Datasize) ->
     %% Fill the buffers
     ?P("sending ~p bytes", [Datasize]),
-    ok = gen_tcp:send(C, Blob),
-    ?P("sent ~p bytes", [Datasize]),
+    case gen_tcp:send(C, Blob) of
+        ok ->
+            ?P("sent ~p bytes", [Datasize]),
+            otp_12242_3(C, Blob, Datasize);
+        {error, {timeout, _RestData}} ->
+            %% We filled the buffers and timed out;
+            %% this is probably the socket backend - give up.
+            ok;
+        {error, timeout} ->
+            %% The same as the previous clause
+            ok
+    end,
+    _ = gen_tcp:close(C),
+    ok.
 
+otp_12242_3(C, Blob, Datasize) ->
     %% Try to ensure that the close call is in progress
     %% before the owner proceeds with sending
     CloserMRef = otp_12242_closer(C),
-- 
2.31.1

Places

File 1482-Fix-tests-for-inet_backend-socket.patch of Package erlang (Revision c698cd69bc2bea1d808e4837af05cc32)

Places