Merge branch 'bmk/kernel/20221208/test_tweaking' into maint

Author: bmk

lib/kernel/test/gen_tcp_misc_SUITE.erl

@@ -6057,6 +6057,21 @@ timeout_sink_loop(Action, To, N) ->
 
 send_timeout_resume(Config) when is_list(Config) ->
     ct:timetrap(?SECS(16)),
+    Cond = fun() ->
+                   case ?IS_SOCKET_BACKEND(Config) of
+                       true ->
+                           {skip, "Unstable with 'socket' backend"};
+                       false ->
+                           Key = kernel_factor,
+                           case lists:keysearch(Key, 1, Config) of
+                               {value, {Key, Factor}} when (Factor > 6) ->
+                                   {skip,
+                                    ?F("Too slow (factor = ~w)", [Factor])};
+                               _ ->
+                                   ok
+                           end
+                   end
+           end,
     Pre  = fun() ->
                    Dir = filename:dirname(code:which(?MODULE)),
                    ?P("create node"),
@@ -6068,7 +6083,7 @@ send_timeout_resume(Config) when is_list(Config) ->
                    ?P("stop node ~p", [Node]),
                    ?STOP_NODE(Node)
            end,
-    ?TC_TRY(?FUNCTION_NAME, Pre, Case, Post).
+    ?TC_TRY(?FUNCTION_NAME, Cond, Pre, Case, Post).
 
 do_send_timeout_resume(Config, RNode, BlockPow) ->
     BlockSize = 1 bsl BlockPow,
@@ -6143,10 +6158,7 @@ do_send_timeout_resume(Config, RNode, BlockPow) ->
                         ?P("count checked out"),
                         ok;
                     {Tag, ok, Count} when Count =:= N * BlockSize ->
-                        ?P("Unexpected number of timeouts, ~w, when"
-                           "~n   Expected count: ~p"
-                           "~n   Got count:      ~p"
-                           "~n   ", [Timeouts, N*BlockSize, Count]),
+                        ?P("Unexpected number of timeouts: ~w", [Timeouts]),
                         ct:fail(Result);
                     {Tag, ok, Count} ->
                         ?P("Unexpected counts: "

lib/kernel/test/socket_SUITE.erl

@@ -753,9 +753,6 @@
 -define(START_NODE(NamePre, Timeout),
         start_node(?CT_PEER_NAME(NamePre), Timeout)).
 
-%% -define(START_NODE(),  ?CT_PEER(#{wait_boot => 5000})).
-%% -define(START_NODE(O), ?CT_PEER(O#{wait_boot => 5000})).
-
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -48837,8 +48834,8 @@ tc_which_name() ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-start_node(Name) ->
-    start_node(Name, 5000).
+%% start_node(Name) ->
+%%     start_node(Name, 5000).
 
 start_node(Name, Timeout) when is_integer(Timeout) andalso (Timeout > 0) ->
     try ?CT_PEER(#{name => Name, wait_boot => Timeout}) of
@@ -48848,15 +48845,15 @@ start_node(Name, Timeout) when is_integer(Timeout) andalso (Timeout > 0) ->
         {error, Reason} ->
             ?SEV_EPRINT("failed starting node ~p (=> SKIP):"
                         "~n   ~p", [Name, Reason]),
-            throw({skip, Reason})
+            skip(Reason)
     catch
         Class:Reason:Stack ->
             ?SEV_EPRINT("Failed starting node: "
                         "~n   Class:  ~p"
                         "~n   Reason: ~p"
                         "~n   Stack:  ~p",
                         [Class, Reason, Stack]),
-            throw({skip, {node_start, Class, Reason}})
+            skip({node_start, Class, Reason})
     end.