File 0117-kernel-gen-udp-test-Tweaked-buffer-size-te... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0117-kernel-gen-udp-test-Tweaked-buffer-size-test-case.patch of Package erlang (Revision a0b3ae25eeaaf8007a46a3a2b2ca2729)

Currently displaying revision a0b3ae25eeaaf8007a46a3a2b2ca2729 , Show latest

From f2360f5cf383b1ea8b77ab34b429ad5d06f79875 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Tue, 11 May 2021 18:02:56 +0200
Subject: [PATCH] [kernel|gen-udp|test] Tweaked buffer-size test case

---
 lib/kernel/test/gen_udp_SUITE.erl | 72 ++++++++++++++++---------------
 1 file changed, 37 insertions(+), 35 deletions(-)

diff --git a/lib/kernel/test/gen_udp_SUITE.erl b/lib/kernel/test/gen_udp_SUITE.erl
index d338bb6502..326af9a38d 100644
--- a/lib/kernel/test/gen_udp_SUITE.erl
+++ b/lib/kernel/test/gen_udp_SUITE.erl
@@ -252,37 +252,44 @@ buffer_size_client(_, _, _, _, _, []) ->
     ok;
 buffer_size_client(Server, IP, Port, 
 		   Socket, Cnt, [Opts|T]) when is_list(Opts) ->
-    io:format("buffer_size_client Cnt=~w setopts ~p.~n", [Cnt,Opts]),
+    ?P("buffer_size_client Cnt=~w setopts ~p", [Cnt, Opts]),
     ok = inet:setopts(Socket, Opts),
     Server ! {self(),setopts,Cnt},
     receive {Server,setopts,Cnt} -> ok end,
     buffer_size_client(Server, IP, Port, Socket, Cnt+1, T);
 buffer_size_client(Server, IP, Port, 
 		   Socket, Cnt, [{B,Replies}|T]=Opts) when is_binary(B) ->
-    io:format(
-      "buffer_size_client Cnt=~w send size ~w expecting ~p.~n",
-      [Cnt,size(B),Replies]),
-    ok = gen_udp:send(Socket, IP, Port, <<Cnt,B/binary>>),
-    receive
-	{Server,Cnt,Reply} ->
-	    Tag =
-		if
-		    is_tuple(Reply) ->
-			element(1, Reply);
-		    is_atom(Reply) ->
-			Reply
-		end,
-	    case lists:member(Tag, Replies) of
-		true -> ok;
-		false ->
-		    ct:fail({reply_mismatch,Cnt,Reply,Replies,
-			     byte_size(B),
-			     inet:getopts(Socket,
-					  [sndbuf,recbuf])})
-	    end,
-	    buffer_size_client(Server, IP, Port, Socket, Cnt+1, T)
-    after 1313 ->
-	    buffer_size_client(Server, IP, Port, Socket, Cnt, Opts)
+    ?P("buffer_size_client Cnt=~w send size ~w expecting ~p",
+       [Cnt, size(B), Replies]),
+    case gen_udp:send(Socket, IP, Port, <<Cnt,B/binary>>) of
+	ok ->
+	    receive
+		{Server,Cnt,Reply} ->
+		    Tag =
+			if
+			    is_tuple(Reply) ->
+				element(1, Reply);
+			    is_atom(Reply) ->
+				Reply
+			end,
+		    case lists:member(Tag, Replies) of
+			true -> ok;
+			false ->
+			    ct:fail({reply_mismatch,Cnt,Reply,Replies,
+				     byte_size(B),
+				     inet:getopts(Socket,
+						  [sndbuf,recbuf])})
+		    end,
+		    buffer_size_client(Server, IP, Port, Socket, Cnt+1, T)
+	    after 1313 ->
+		    buffer_size_client(Server, IP, Port, Socket, Cnt, Opts)
+	    end;
+	{error, Reason} ->
+	    ?P("<ERROR> Failed sending data ~w bytes of data: "
+	       "~n   SndBuf: ~p"
+	       "~n   Reason: ~p",
+	       [size(B), inet:getopts(Socket, [sndbuf]), Reason]),
+	    ct:fail(Reason)
     end.
 
 buffer_size_server(_, _, _, _, _, []) -> 
@@ -290,23 +297,19 @@ buffer_size_server(_, _, _, _, _, []) ->
 buffer_size_server(Client, IP, Port, 
 		   Socket, Cnt, [Opts|T]) when is_list(Opts) ->
     receive {Client,setopts,Cnt} -> ok end,
-    io:format("buffer_size_server Cnt=~w setopts ~p.~n", [Cnt,Opts]),
+    ?P("buffer_size_server Cnt=~w setopts ~p", [Cnt, Opts]),
     ok = inet:setopts(Socket, Opts),
     Client ! {self(),setopts,Cnt},
     buffer_size_server(Client, IP, Port, Socket, Cnt+1, T);
 buffer_size_server(Client, IP, Port, 
 		   Socket, Cnt, [{B,_}|T]) when is_binary(B) ->
-    io:format(
-      "buffer_size_server Cnt=~w expecting size ~w.~n",
-      [Cnt,size(B)]),
+    ?P("buffer_size_server Cnt=~w expecting size ~w", [Cnt, size(B)]),
     Client ! 
 	{self(),Cnt,
 	 case buffer_size_server_recv(Socket, IP, Port, Cnt) of
 	     D when is_binary(D) ->
 		 SizeD = byte_size(D),
-		 io:format(
-		   "buffer_size_server Cnt=~w received size ~w.~n",
-		   [Cnt,SizeD]),
+		 ?P("buffer_size_server Cnt=~w received size ~w", [Cnt, SizeD]),
 		 case B of
 		     D ->
 			 correct;
@@ -316,9 +319,8 @@ buffer_size_server(Client, IP, Port,
 			 {unexpected,D}
 		 end;
 	     Error ->
-		 io:format(
-		   "buffer_size_server Cnt=~w received error ~w.~n",
-		   [Cnt,Error]),
+		 ?P("buffer_size_server Cnt=~w received error ~w",
+		    [Cnt, Error]),
 		 Error
 	 end},
     buffer_size_server(Client, IP, Port, Socket, Cnt+1, T).
-- 
2.26.2

Places

File 0117-kernel-gen-udp-test-Tweaked-buffer-size-test-case.patch of Package erlang (Revision a0b3ae25eeaaf8007a46a3a2b2ca2729)

Places