[snmp|agent|test] More test tweaking

Improved test printouts (more with timestamps), also
fixed the printouts of the (fake) local-db start
result printout.

Also updated the copyright end-dates.

6 files changed, 119 insertions, 75 deletions

diff --git a/lib/snmp/test/snmp_agent_test.erl b/lib/snmp/test/snmp_agent_test.erl
index b71614ed51..c4365e6a96 100644
--- a/lib/snmp/test/snmp_agent_test.erl
+++ b/lib/snmp/test/snmp_agent_test.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2003-2018. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2019. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/lib/snmp/test/snmp_agent_test_lib.erl b/lib/snmp/test/snmp_agent_test_lib.erl
index 8749df0c3f..70e2e5f235 100644
--- a/lib/snmp/test/snmp_agent_test_lib.erl
+++ b/lib/snmp/test/snmp_agent_test_lib.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2005-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2019. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -358,22 +358,22 @@ run(Mod, Func, Args, Opts) ->
 	   "~n   StdM:        ~p",
 	   [M,Vsn,Dir,User,SecLevel,EngineID,CtxEngineID,Community,StdM]),
     case snmp_test_mgr:start([%% {agent, snmp_test_lib:hostname()},
-			      {packet_server_debug,true},
-			      {debug,true},
-			      {agent, get(master_host)}, 
-			      {ipfamily, get(ipfamily)},
-			      {agent_udp, 4000},
-			      {trap_udp, 5000},
-			      {recbuf,65535},
+			      {packet_server_debug, true},
+			      {debug,               true},
+			      {agent,               get(master_host)}, 
+			      {ipfamily,            get(ipfamily)},
+			      {agent_udp,           4000},
+			      {trap_udp,            5000},
+			      {recbuf,              65535},
 			      quiet,
 			      Vsn, 
-			      {community, Community},
-			      {user, User},
-			      {sec_level, SecLevel},
-			      {engine_id, EngineID},
-			      {context_engine_id, CtxEngineID},
-			      {dir, Dir},
-			      {mibs, mibs(StdM, M)}]) of
+			      {community,           Community},
+			      {user,                User},
+			      {sec_level,           SecLevel},
+			      {engine_id,           EngineID},
+			      {context_engine_id,   CtxEngineID},
+			      {dir,                 Dir},
+			      {mibs,                mibs(StdM, M)}]) of
 	{ok, _Pid} ->
 	    case (catch apply(Mod, Func, Args)) of
 		{'EXIT', Reason} ->
@@ -383,10 +383,18 @@ run(Mod, Func, Args, Opts) ->
 		    catch snmp_test_mgr:stop(),
 		    Res
 	    end;
+
+	{error, Reason} ->
+	    ?EPRINT2("Failed starting (test) manager: "
+                     "~n   ~p", [Reason]),
+	    catch snmp_test_mgr:stop(),
+	    ?line ?FAIL({mgr_start_error, Reason});
+
 	Err ->
-	    io:format("Error starting manager: ~p\n", [Err]),
+	    ?EPRINT2("Failed starting (test) manager: "
+                     "~n   ~p", [Err]),
 	    catch snmp_test_mgr:stop(),
-	    ?line ?FAIL({mgr_start, Err})
+	    ?line ?FAIL({mgr_start_failure, Err})
     end.
 
 
@@ -905,8 +913,8 @@ io_format_expect(F) ->
     io_format_expect(F, []).
 
 io_format_expect(F, A) ->
-    FTS = snmp_test_lib:formated_timestamp(),
-    io:format("[~s] EXPECT " ++ F ++ "~n", [FTS | A]).
+    ?PRINT2("EXPECT " ++ F, A).
+    
 
 do_expect(Expect) when is_atom(Expect) ->
     do_expect({Expect, get_timeout()});
diff --git a/lib/snmp/test/snmp_test_lib.erl b/lib/snmp/test/snmp_test_lib.erl
index 290f1bc31a..4973630ea2 100644
--- a/lib/snmp/test/snmp_test_lib.erl
+++ b/lib/snmp/test/snmp_test_lib.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2002-2015. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2019. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -41,7 +41,7 @@
 -export([watchdog/3, watchdog_start/1, watchdog_start/2, watchdog_stop/1]).
 -export([del_dir/1]).
 -export([cover/1]).
--export([p/2, print/5, formated_timestamp/0]).
+-export([p/2, print1/2, print2/2, print/5, formated_timestamp/0]).
 
 
 %% ----------------------------------------------------------------------
@@ -605,6 +605,24 @@ p(Mod, Case) when is_atom(Mod) andalso is_atom(Case) ->
 p(F, A) when is_list(F) andalso is_list(A) ->
     io:format(user, F ++ "~n", A).
 
+%% This is just a bog standard printout, with a (formatted) timestamp
+%% prefix and a newline after.
+%% print1 prints to both standard_�o and to user. print2 just to standard_�o.
+
+print_format(F, A) ->
+    FTS = snmp_test_lib:formated_timestamp(),
+    io_lib:format("[~s] " ++ F ++ "~n", [FTS | A]).
+
+print1(F, A) ->
+    S = print_format(F, A),
+    io:format("~s", [S]),
+    io:format(user, "~s", [S]).
+
+print2(F, A) ->
+    S = print_format(F, A),
+    io:format("~s", [S]).
+
+
 print(Prefix, Module, Line, Format, Args) ->
     io:format("*** [~s] ~s ~p ~p ~p:~p *** " ++ Format ++ "~n", 
 	      [formated_timestamp(), 
@@ -618,6 +636,6 @@ format_timestamp({_N1, _N2, N3} = Now) ->
     {YYYY,MM,DD}   = Date,
     {Hour,Min,Sec} = Time,
     FormatDate =
-        io_lib:format("~.4w:~.2.0w:~.2.0w ~.2.0w:~.2.0w:~.2.0w ~w",
-                      [YYYY,MM,DD,Hour,Min,Sec,round(N3/1000)]),
+        io_lib:format("~.4w:~.2.0w:~.2.0w-~.2.0w:~.2.0w:~.2.0w.~w",
+                      [YYYY, MM, DD, Hour, Min, Sec, round(N3/1000)]),
     lists:flatten(FormatDate).
diff --git a/lib/snmp/test/snmp_test_lib.hrl b/lib/snmp/test/snmp_test_lib.hrl
index 7acebee1f1..335f3fff3c 100644
--- a/lib/snmp/test/snmp_test_lib.hrl
+++ b/lib/snmp/test/snmp_test_lib.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2002-2015. All Rights Reserved.
+%% Copyright Ericsson AB 2002-2019. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -127,24 +127,31 @@
 -endif.
 
 -ifdef(snmp_debug).
--define(DBG(F,A),?PRINT("DBG",F,A)).
+-define(DBG(F,A), ?PRINT("DBG", F, A)).
 -else.
--define(DBG(F,A),ok).
+-define(DBG(F,A), ok).
 -endif.
 
 -ifdef(snmp_log).
--define(LOG(F,A),?PRINT("LOG",F,A)).
+-define(LOG(F,A), ?PRINT("LOG", F, A)).
 -else.
--define(LOG(F,A),ok).
+-define(LOG(F,A), ok).
 -endif.
 
 -ifdef(snmp_error).
--define(ERR(F,A),?PRINT("ERR",F,A)).
+-define(ERR(F,A), ?PRINT("ERR", F, A)).
 -else.
--define(ERR(F,A),ok).
+-define(ERR(F,A), ok).
 -endif.
 
--define(INF(F,A),?PRINT("INF",F,A)).
+-define(INF(F,A), ?PRINT("INF", F, A)).
 
 -define(PRINT(P,F,A),
-	snmp_test_lib:print(P,?MODULE,?LINE,F,A)).
+	snmp_test_lib:print(P, ?MODULE, ?LINE, F, A)).
+
+-define(PRINT1(F, A),  snmp_test_lib:print1(F, A)).
+-define(EPRINT1(F, A), ?PRINT1("<ERROR> " ++ F, A)).
+
+-define(PRINT2(F, A),  snmp_test_lib:print2(F, A)).
+-define(EPRINT2(F, A), ?PRINT2("<ERROR> " ++ F, A)).
+
diff --git a/lib/snmp/test/snmp_test_mgr.erl b/lib/snmp/test/snmp_test_mgr.erl
index 36637d5cf4..73a4d56084 100644
--- a/lib/snmp/test/snmp_test_mgr.erl
+++ b/lib/snmp/test/snmp_test_mgr.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2015. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2019. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -20,8 +20,10 @@
 
 -module(snmp_test_mgr).
 
+
 %%----------------------------------------------------------------------
-%% This module implements a simple SNMP manager for Erlang.
+%% This module implements a simple SNMP manager for Erlang. Its used
+%% during by the agent test suite.
 %%----------------------------------------------------------------------
 
 %% c(snmp_test_mgr).
@@ -49,16 +51,17 @@
 
 -include_lib("snmp/include/snmp_types.hrl").
 -include_lib("snmp/include/STANDARD-MIB.hrl").
-
--record(state,{dbg         = true,
-	       quiet,
-	       parent,
-	       timeout     = 3500,
-	       print_traps = true,
-	       mini_mib,
-	       packet_server, 
-	       last_sent_pdu, 
-	       last_received_pdu}).
+-include("snmp_test_lib.hrl").
+
+-record(state, {dbg         = true,
+                quiet,
+                parent,
+                timeout     = 3500,
+                print_traps = true,
+                mini_mib,
+                packet_server, 
+                last_sent_pdu, 
+                last_received_pdu}).
 
 -define(SERVER, ?MODULE).
 -define(PACK_SERV, snmp_test_mgr_misc).
@@ -197,27 +200,28 @@ init({Options, CallerPid}) ->
 	    put(debug, get_value(debug, Options, false)),
 	    d("init -> (~p) extract options",[self()]),
  	    PacksDbg    = get_value(packet_server_debug, Options, false),
-	    io:format("[~w] ~p -> PacksDbg: ~p~n", [?MODULE, self(), PacksDbg]),
+	    print("[~w] ~p -> PacksDbg: ~p~n", [?MODULE, self(), PacksDbg]),
 	    RecBufSz    = get_value(recbuf,            Options, 1024),
-	    io:format("[~w] ~p -> RecBufSz: ~p~n", [?MODULE, self(), RecBufSz]),
+	    print("[~w] ~p -> RecBufSz: ~p~n", [?MODULE, self(), RecBufSz]),
 	    Mibs        = get_value(mibs,              Options, []),
-	    io:format("[~w] ~p -> Mibs: ~p~n", [?MODULE, self(), Mibs]),
+	    print("[~w] ~p -> Mibs: ~p~n", [?MODULE, self(), Mibs]),
 	    Udp         = get_value(agent_udp,         Options, 4000),
-	    io:format("[~w] ~p -> Udp: ~p~n", [?MODULE, self(), Udp]),
+	    print("[~w] ~p -> Udp: ~p~n", [?MODULE, self(), Udp]),
 	    User        = get_value(user,              Options, "initial"),
-	    io:format("[~w] ~p -> User: ~p~n", [?MODULE, self(), User]),
+	    print("[~w] ~p -> User: ~p~n", [?MODULE, self(), User]),
 	    EngineId    = get_value(engine_id,         Options, "agentEngine"),
-	    io:format("[~w] ~p -> EngineId: ~p~n", [?MODULE, self(), EngineId]),
+	    print("[~w] ~p -> EngineId: ~p~n", [?MODULE, self(), EngineId]),
 	    CtxEngineId = get_value(context_engine_id, Options, EngineId),
-	    io:format("[~w] ~p -> CtxEngineId: ~p~n", [?MODULE, self(), CtxEngineId]),
+	    print("[~w] ~p -> CtxEngineId: ~p~n", [?MODULE, self(), CtxEngineId]),
 	    TrapUdp     = get_value(trap_udp,          Options, 5000),
-	    io:format("[~w] ~p -> TrapUdp: ~p~n", [?MODULE, self(), TrapUdp]),
+	    print("[~w] ~p -> TrapUdp: ~p~n", [?MODULE, self(), TrapUdp]),
 	    Dir         = get_value(dir,               Options, "."),
-	    io:format("[~w] ~p -> Dir: ~p~n", [?MODULE, self(), Dir]),
+	    print("[~w] ~p -> Dir: ~p~n", [?MODULE, self(), Dir]),
 	    SecLevel    = get_value(sec_level,         Options, noAuthNoPriv),
-	    io:format("[~w] ~p -> SecLevel: ~p~n", [?MODULE, self(), SecLevel]),
+	    print("[~w] ~p -> SecLevel: ~p~n", [?MODULE, self(), SecLevel]),
 	    MiniMIB     = snmp_mini_mib:create(Mibs),
-	    io:format("[~w] ~p -> MiniMIB: ~p~n", [?MODULE, self(), MiniMIB]),
+	    d("[~w] ~p -> MiniMIB: "
+              "~n   ~p", [?MODULE, self(), MiniMIB]),
 	    Version     = case lists:member(v2, Options) of
 			      true -> 'version-2';
 			      false -> 
@@ -226,19 +230,19 @@ init({Options, CallerPid}) ->
 				      false -> 'version-1'
 				  end
 			  end,
-	    io:format("[~w] ~p -> Version: ~p~n", [?MODULE, self(), Version]),
+	    print("[~w] ~p -> Version: ~p~n", [?MODULE, self(), Version]),
 	    Com = case Version of
 		      'version-3' ->
 			  get_value(context, Options, "");
 		      _ ->
 			  get_value(community, Options, "public")
 		  end,
-	    io:format("[~w] ~p -> Com: ~p~n", [?MODULE, self(), Com]),
+	    print("[~w] ~p -> Com: ~p~n", [?MODULE, self(), Com]),
 	    VsnHdrD = 
 		{Com, User, EngineId, CtxEngineId, mk_seclevel(SecLevel)},
-	    io:format("[~w] ~p -> VsnHdrD: ~p~n", [?MODULE, self(), VsnHdrD]),
+	    print("[~w] ~p -> VsnHdrD: ~p~n", [?MODULE, self(), VsnHdrD]),
 	    IpFamily = get_value(ipfamily, Options, inet),
-	    io:format("[~w] ~p -> IpFamily: ~p~n", [?MODULE, self(), IpFamily]),
+	    print("[~w] ~p -> IpFamily: ~p~n", [?MODULE, self(), IpFamily]),
 	    AgIp = case snmp_misc:assq(agent, Options) of
 		       {value, Tuple4} when is_tuple(Tuple4) andalso 
 					    (size(Tuple4) =:= 4) ->
@@ -247,9 +251,9 @@ init({Options, CallerPid}) ->
 			   {ok, Ip} = snmp_misc:ip(Host, IpFamily),
 			   Ip
 		   end,
-	    io:format("[~w] ~p -> AgIp: ~p~n", [?MODULE, self(), AgIp]),
+	    print("[~w] ~p -> AgIp: ~p~n", [?MODULE, self(), AgIp]),
 	    Quiet = lists:member(quiet, Options),
-	    io:format("[~w] ~p -> Quiet: ~p~n", [?MODULE, self(), Quiet]),
+	    print("[~w] ~p -> Quiet: ~p~n", [?MODULE, self(), Quiet]),
 	    PackServ =
 		start_packet_server(
 		  Quiet, Options, CallerPid, AgIp, Udp, TrapUdp,
@@ -443,7 +447,8 @@ handle_cast({bulk, Args}, State) ->
     {noreply, execute_request(bulk, Args, State)};
 
 handle_cast({response, RespPdu}, State) ->
-    d("handle_cast -> response request with ~p", [RespPdu]),
+    d("handle_cast -> response request with "
+      "~n   ~p", [RespPdu]),
     ?PACK_SERV:send_pdu(RespPdu, State#state.packet_server),
     {noreply, State};
 
@@ -1126,14 +1131,15 @@ sizeOf(L) when is_list(L) ->
 sizeOf(B) when is_binary(B) ->
     size(B).
 
-d(F,A) -> d(get(debug),F,A).
+d(F, A) -> d(get(debug), F, A).
 
-d(true,F,A) ->
-    io:format("*** [~s] MGR_DBG *** " ++ F ++ "~n",
-	      [formated_timestamp()|A]);
+d(true, F, A) ->
+    print(F, A);
 d(_,_F,_A) -> 
     ok.
 
+print(F, A) ->
+    ?PRINT2("MGR " ++ F, A).
 
 formated_timestamp() ->
     snmp_test_lib:formated_timestamp().
diff --git a/lib/snmp/test/snmp_test_mgr_misc.erl b/lib/snmp/test/snmp_test_mgr_misc.erl
index b52cd06bd5..badbbad894 100644
--- a/lib/snmp/test/snmp_test_mgr_misc.erl
+++ b/lib/snmp/test/snmp_test_mgr_misc.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2019. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -39,11 +39,13 @@
 -define(SNMP_USE_V3, true).
 -include_lib("snmp/include/snmp_types.hrl").
 -include_lib("snmp/src/misc/snmp_verbosity.hrl").
+-include("snmp_test_lib.hrl").
 
 
 %%----------------------------------------------------------------------
 %% The InHandler process will receive messages on the form {snmp_pdu, Pdu}.
 %%----------------------------------------------------------------------
+
 start_link_packet(
   InHandler, AgentIp, UdpPort, TrapUdp, VsnHdr, Version, Dir, BufSz) ->
     start_link_packet(
@@ -606,11 +608,12 @@ init_usm('version-3', Dir) ->
     case snmpa_local_db:start_link(normal, Dir,
                                    [{sname,     "MGR-LOCAL-DB"},
                                     {verbosity, trace}]) of
-        {ok, _} ->
-            ok;
+        {ok, Pid} ->
+            ?vlog("started: ~p"
+                  "~n      ~p", [Pid, process_info(Pid)]);
         {error, {already_started, Pid}} ->
             ?vlog("already started: ~p"
-                  "~n   ~p", [process_info(Pid)])
+                  "~n      ~p", [Pid, process_info(Pid)])
     end,
     NameDb = snmpa_agent:db(snmpEngineID),
     ?vlog("init_usm -> try set manager engine-id", []),
@@ -819,13 +822,15 @@ sz(O) ->
     {unknown_size, O}.
 
 d(F)   -> d(F, []).
-d(F,A) -> d(get(debug),F,A).
+d(F,A) -> d(get(debug), F, A).
 
-d(true,F,A) ->
-    io:format("*** [~s] MGR_PS_DBG *** " ++ F ++ "~n",
-	      [formated_timestamp()|A]);
+d(true, F, A) ->
+    print(F, A);
 d(_,_F,_A) -> 
     ok.
 
+print(F, A) ->
+    ?PRINT2("MGR_PS " ++ F, A).
+    
 formated_timestamp() ->
     snmp_test_lib:formated_timestamp().