Merge branch 'bmk/snmp/20250612/test_tweaking' into maint

Author: bmk

lib/snmp/test/snmp_agent_SUITE.erl

@@ -753,7 +753,7 @@ init_per_group(GroupName, Config0) ->
             "~n      Nodes:     ~p",
             [?FUNCTION_NAME, GroupName, Config0, nodes()]),
 
-    case init_per_group2(GroupName, Config0) of
+    try init_per_group2(GroupName, Config0) of
         Config1 when is_list(Config1) ->
 
             ?IPRINT("~w(~w) -> done when"
@@ -770,6 +770,15 @@ init_per_group(GroupName, Config0) ->
                     "~n      Nodes:       ~p",
                     [?FUNCTION_NAME, GroupName, SkipReason, nodes()]),
 
+            SKIP
+    catch
+        Class:{skip, SkipReason} = SKIP ->
+
+            ?IPRINT("~w(~w) -> done when SKIP (~w)"
+                    "~n      Skip Reason: ~p"
+                    "~n      Nodes:       ~p",
+                    [?FUNCTION_NAME, GroupName, Class, SkipReason, nodes()]),
+
             SKIP
     end.
 

lib/snmp/test/snmp_agent_test_lib.erl

@@ -130,15 +130,17 @@ init_all(Config) when is_list(Config) ->
     %% Start nodes
     %%
 
-    ?IPRINT("init_all -> start sub-agent node"),
-    Args = ["-s", "snmp_test_sys_monitor", "start", "-s", "global", "sync"],
+    %% Since our nodes run through many test cases,
+    %% we, *current* process, cannot be linked to it.
+    %% Since we (current process) are dead once this
+    %% initiation is done, which would get the 'Peer'
+    %% process to terminate the node.
 
-    {ok, SaPeer, SaNode}  = ?CT_PEER(#{name => ?CT_PEER_NAME(snmp_sa), args => Args}),
-    unlink(SaPeer), %% must unlink, otherwise peer will exit before test case
+    ?IPRINT("init_all -> start sub-agent node"),
+    {SaPeer, SaNode} = ?START_NODE(?CT_PEER_NAME(snmp_sa), true),
 
     ?IPRINT("init_all -> start manager node"),
-    {ok, MgrPeer, MgrNode} = ?CT_PEER(#{name => ?CT_PEER_NAME(snmp_mgr), args => Args}),
-    unlink(MgrPeer), %% must unlink, otherwise peer will exit before test case
+    {MgrPeer, MgrNode} = ?START_NODE(?CT_PEER_NAME(snmp_mgr), true),
 
     global:sync(),
 

lib/snmp/test/snmp_manager_SUITE.erl

@@ -6263,11 +6263,9 @@ agent_info(Node) ->
 %% -- Misc node operation wrapper functions --
 
 start_node(Case) ->
-    Args = ["-s", "snmp_test_sys_monitor", "start", "-s", "global", "sync"],
     Name = peer:random_name(lists:concat([?MODULE, "-", Case])),
-    {ok, Peer, Node}  = ?CT_PEER(#{name => Name, args => Args}),
-    global:sync(),
-    {Peer, Node}.
+    ?START_NODE(Name, false).
+
 
 %% -- Misc config wrapper functions --
 

lib/snmp/test/snmp_test_lib.erl

@@ -23,6 +23,7 @@
 -module(snmp_test_lib).
 
 -include_lib("kernel/include/file.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 
 -export([tc_try/2, tc_try/3,
@@ -42,7 +43,7 @@
 -export([fail/3, skip/3]).
 -export([hours/1, minutes/1, seconds/1, sleep/1]).
 -export([pi/2, flush_mqueue/0, mqueue/0, mqueue/1, trap_exit/0, trap_exit/1]).
--export([ping/1, local_nodes/0, nodes_on/1]).
+-export([start_node/2, ping/1, local_nodes/0, nodes_on/1]).
 -export([is_app_running/1,
 	 is_crypto_running/0, is_mnesia_running/0, is_snmp_running/0,
          ensure_not_running/3]).
@@ -1042,7 +1043,10 @@ fail(Reason, Mod, Line) ->
 skip(Reason, Module, Line) ->
     String = lists:flatten(io_lib:format("Skipping ~p(~p): ~p~n", 
 					 [Module, Line, Reason])),
-    exit({skip, String}).
+    skip(String).
+
+skip(Reason) ->
+    exit({skip, Reason}).
 
 
 %% This function prints various host info, which might be useful
@@ -3163,6 +3167,42 @@ trap_exit(Flag) ->
 %% Node utility functions
 %% 
 
+%% This hinges on an updated peer verbose start
+%% -define(VERBOSE_PEER_START, true).
+
+-ifdef(VERBOSE_PEER_START).
+-define(MAYBE_VERBOSE_START(SO), (SO)#{verbose => true}).
+-define(START_OPTIONS(SO), (SO)#{connection => standard_io}).
+-else.
+-define(MAYBE_VERBOSE_START(SO), SO).
+-define(START_OPTIONS(SO), SO).
+-endif.
+
+start_node(Name, Unlink) ->
+    Args = ["-s", "snmp_test_sys_monitor", "start", "-s", "global", "sync"],
+    %% Note that the 'verbose' option may not exist...
+    %% If it does not exist, this (verbose => true) "should" do nothing...
+    BaseStartOptions = #{name => Name,
+                         args => Args},
+    StartOptions0    = ?MAYBE_VERBOSE_START(BaseStartOptions),
+    StartOptions     = ?START_OPTIONS(StartOptions0),
+    case ?CT_PEER(StartOptions) of
+        {ok, Peer, Node}  ->
+            %% Must unlink, otherwise peer will exit before test case
+            maybe_unlink(Unlink, Peer),
+            global:sync(),
+            {Peer, Node};
+        {error, Reason} ->
+            %%% throw({skip, {failed_starting_node, Name, Reason}})
+            skip({failed_starting_node, Name, Reason})
+    end.
+
+maybe_unlink(true, Pid) ->
+    unlink(Pid);
+maybe_unlink(false, _) ->
+    ok.
+
+    
 ping(N) ->
     case net_adm:ping(N) of
  	pang ->

lib/snmp/test/snmp_test_lib.hrl

@@ -58,6 +58,7 @@
         ?LIB:non_pc_tc_maybe_skip(Config, Condition, ?MODULE, ?LINE)).
 
 -define(SKIP(Reason),        ?LIB:skip(Reason, ?MODULE, ?LINE)).
+-define(SKIPT(Reason),       throw({skip, Reason})).
 -define(FAIL(Reason),        ?LIB:fail(Reason, ?MODULE, ?LINE)).
 -define(HAS_SUPPORT_IPV6(),  ?LIB:has_support_ipv6()).
 
@@ -104,9 +105,10 @@
 
 %% - Node utility macros - 
 
--define(PING(N),            ?LIB:ping(N)).
--define(LNODES(),           ?LIB:local_nodes()).
--define(NODES(H),           ?LIB:nodes_on(H)).
+-define(START_NODE(N, U), ?LIB:start_node((N), (U))).
+-define(PING(N),          ?LIB:ping(N)).
+-define(LNODES(),         ?LIB:local_nodes()).
+-define(NODES(H),         ?LIB:nodes_on(H)).
 
 %% - Application and Crypto utility macros -