File 0496-kernel-gen-tcp-misc-test-Tweaked-killing-m... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0496-kernel-gen-tcp-misc-test-Tweaked-killing-multi-accep.patch of Package erlang (Revision b4f72044e1af8cfe32130ab849a401a1)

Currently displaying revision b4f72044e1af8cfe32130ab849a401a1 , Show latest

From fbad384d1ae476126c29fa6c63b6a4d9083aea36 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Thu, 6 May 2021 15:09:06 +0200
Subject: [PATCH 2/2] [kernel|gen-tcp-misc|test] Tweaked 'killing multi
 acceptors'

Timeout on virtual Linux Mint 19: Add some printouts...
---
 lib/kernel/test/gen_tcp_misc_SUITE.erl | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/lib/kernel/test/gen_tcp_misc_SUITE.erl b/lib/kernel/test/gen_tcp_misc_SUITE.erl
index 0a825d2edf..8a51b2ebfa 100644
--- a/lib/kernel/test/gen_tcp_misc_SUITE.erl
+++ b/lib/kernel/test/gen_tcp_misc_SUITE.erl
@@ -3103,6 +3103,7 @@ collect_accepts(N,Tmo) ->
 	    [{P,Msg}] ++ collect_accepts(NextN, Tmo - (millis()-A))
 
     after Tmo ->
+            ?P("accept timeout (~w)", [Tmo]),
 	    []
     end.
    
@@ -3536,7 +3537,29 @@ do_killing_multi_acceptors_inet(LS) ->
     end,
     {ok,L2} = prim_inet:getstatus(LS),
     true  = lists:member(accepting, L2),
-    ok = ?EXPECT_ACCEPTS([{Pid2,{error,timeout}}],1,1000),
+    case ?EXPECT_ACCEPTS([{Pid2, {error,timeout}}], 1, 1000) of
+	ok ->
+	    ?P("second acceptor - expected result"),
+	    ok;
+	Any ->
+	    ?P("second acceptor - failed:"
+	       "~n      ~p", [Any]),
+	    %% Check what Pid2 is doing
+	    Pid2Info1 = process_info(Pid2),
+	    Pid2Msgs1 = process_info(Pid2, messages),
+	    %% Check if this is just a race...
+	    ?SLEEP(?SECS(1)),
+	    Pid2Info2 = process_info(Pid2),
+	    Pid2Msgs2 = process_info(Pid2, messages),
+	    ?P("second acceptor failed - check ~p"
+	       "~n      Info 1: ~p"
+	       "~n      Msgs 1: ~p"
+	       "~n   After 1 sec sleep:"
+	       "~n      Info 2: ~p"
+	       "~n      Msgs 2: ~p",
+	       [Pid2, Pid2Info1, Pid2Msgs1, Pid2Info2, Pid2Msgs2]),
+	    ct:fail({unexpected_accepts, Any})
+    end,
     {ok,L3} = prim_inet:getstatus(LS),
     false  = lists:member(accepting, L3),
     ok.
-- 
2.26.2

Places

File 0496-kernel-gen-tcp-misc-test-Tweaked-killing-multi-accep.patch of Package erlang (Revision b4f72044e1af8cfe32130ab849a401a1)

Places