File 0721-megaco-test-Improving-the-example-and-mib-... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0721-megaco-test-Improving-the-example-and-mib-test-suite.patch of Package erlang (Revision 4125bb34047926b58204fc1db7993cd3)

Currently displaying revision 4125bb34047926b58204fc1db7993cd3 , Show latest

From 21b6eab8c2aa2f0754e1cb1a8edcbd936824b4c5 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Wed, 5 Jun 2019 12:43:23 +0200
Subject: [PATCH 1/5] [megaco|test] Improving the example and mib test suites

The examples test suite was hard to debug just based
on its output (both plain debug printouts and printouts
generated via dbg). Some timeouts has been added between
the various actions so that it will be easier to understand
the output.
---
 lib/megaco/test/megaco_examples_test.erl | 155 +++++++++++++++++++-----------
 lib/megaco/test/megaco_mib_test.erl      | 159 ++++++++++++++++++++++++-------
 lib/megaco/test/megaco_test_lib.erl      |  54 ++++++++++-
 lib/megaco/test/megaco_test_lib.hrl      |   6 +-
 4 files changed, 274 insertions(+), 100 deletions(-)

diff --git a/lib/megaco/test/megaco_examples_test.erl b/lib/megaco/test/megaco_examples_test.erl
index 45a6c5011a..3d2d79f413 100644
--- a/lib/megaco/test/megaco_examples_test.erl
+++ b/lib/megaco/test/megaco_examples_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2001-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.
@@ -56,7 +56,8 @@ load_examples() ->
 	{error, Reason} ->
 	    {error, Reason};
 	Dir ->
-	    [code:load_abs(filename:join([Dir, examples, simple, M])) || M <- example_modules()]
+	    [code:load_abs(filename:join([Dir, examples, simple, M])) || 
+                M <- example_modules()]
     end.
 
 purge_examples() ->
@@ -67,6 +68,7 @@ purge_examples() ->
 	    [code:purge(M) || M <- example_modules()]
     end.
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Top test case
 
@@ -88,70 +90,109 @@ simple(suite) ->
     [];
 simple(Config) when is_list(Config) ->
     ?ACQUIRE_NODES(1, Config),
-    d("simple -> proxy start",[]),
+    d("simple -> proxy start"),
     ProxyPid = megaco_test_lib:proxy_start({?MODULE, ?LINE}),
 
-    d("simple -> start megaco",[]),
+    d("simple -> start megaco"),
     ?VERIFY(ok, megaco:start()),
     
-    d("simple -> start mgc",[]),
-    ?APPLY(ProxyPid, fun() -> megaco_simple_mgc:start() end),
-    receive
-	{res, _, {ok, MgcAll}} when is_list(MgcAll) ->
-	    MgcBad = [MgcRes || MgcRes <- MgcAll, element(1, MgcRes) /= ok],
-	    ?VERIFY([], MgcBad),
-	    %% MgcGood = MgcAll -- MgcBad,
-	    %% MgcRecHandles = [MgcRH || {ok, _MgcPort, MgcRH} <- MgcGood],
-
-	    d("simple -> start mg",[]),
-	    ?APPLY(ProxyPid, fun() -> megaco_simple_mg:start() end),
-	    receive
-		{res, _, MgList} when is_list(MgList) andalso (length(MgList) =:= 4) ->
-		    d("simple -> received res: ~p",[MgList]),		    
-		    Verify = 
-			fun({_MgMid, {TransId, Res}}) when TransId =:= 1 ->
-				case Res of
-				    {ok, [AR]} when is_record(AR, 'ActionReply') ->
-					case AR#'ActionReply'.commandReply of
-					    [{serviceChangeReply, SCR}] ->
-						case SCR#'ServiceChangeReply'.serviceChangeResult of
-						    {serviceChangeResParms, MgcMid} when MgcMid /= asn1_NOVALUE ->
-							ok;
-						    Error ->
-							?ERROR(Error)
-						end;
-					    Error ->
-						?ERROR(Error)
-					end;
-				    Error ->
-					?ERROR(Error)
-				end;
-			   (Error) ->
-				?ERROR(Error)
-			end,
-		    lists:map(Verify, MgList);
-		Error ->
-		    ?ERROR(Error)
-	    end;
-	Error ->
-	    ?ERROR(Error)
-    end,
-    d("simple -> verify info()",[]),
+    start_mgc(ProxyPid),
+
+    ?SLEEP(1000), % This is just to make it easier to read the test logs
+
+    start_mg(ProxyPid),
+    
+    ?SLEEP(1000), % This is just to make it easier to read the test logs
+
+    d("simple -> verify info()"),
     info(),
-    d("simple -> verify system_info(users)",[]),
+
+    d("simple -> verify system_info(users)"),
     users(),
-    d("simple -> stop mgc",[]),
+
+    d("simple -> stop mgc"),
     ?VERIFY(5, length(megaco_simple_mgc:stop())),
-    d("simple -> verify system_info(users)",[]),
+    ?SLEEP(1000), % This is just to make it easier to read the test logs
+
+    d("simple -> verify system_info(users)"),
     users(),
-    d("simple -> stop megaco",[]),
+
+    d("simple -> stop megaco"),
     ?VERIFY(ok, megaco:stop()),
-    d("simple -> kill (exit) ProxyPid: ~p",[ProxyPid]),
+    ?SLEEP(1000), % This is just to make it easier to read the test logs
+
+    d("simple -> kill (exit) ProxyPid: ~p", [ProxyPid]),
     exit(ProxyPid, shutdown), % Controlled kill of transport supervisors
 
     ok.
 
 
+start_mgc(ProxyPid) ->
+    d("start_mgc -> start"),
+    ?APPLY(ProxyPid, fun() -> megaco_simple_mgc:start() end),
+    receive
+	{res, _, {ok, MgcAll}} when is_list(MgcAll) ->
+            ?SLEEP(1000), % This is just to make it easier to read the test logs
+            d("start_mgc -> received MGC response: "
+              "~n   ~p", [MgcAll]),
+	    MgcBad = [MgcRes || MgcRes <- MgcAll, element(1, MgcRes) /= ok],
+	    ?VERIFY([], MgcBad),
+            ok;
+        Error ->
+            ?ERROR(Error)
+    end.
+
+start_mg(ProxyPid) ->
+    d("start_mg -> start"),
+    ?APPLY(ProxyPid, fun() -> megaco_simple_mg:start() end),
+    receive
+        {res, _, MgList} when is_list(MgList) andalso (length(MgList) =:= 4) ->
+            ?SLEEP(1000), % This is just to make it easier to read the test logs
+            d("start_mg -> received MG response: "
+              "~n   ~p", [MgList]),
+            Verify = 
+                fun({_MgMid, {TransId, Res}}) when TransId =:= 1 ->
+                        case Res of
+                            {ok, [AR]} when is_record(AR, 'ActionReply') ->
+                                case AR#'ActionReply'.commandReply of
+                                    [{serviceChangeReply, SCR}] ->
+                                        case SCR#'ServiceChangeReply'.serviceChangeResult of
+                                            {serviceChangeResParms, MgcMid}
+                                              when MgcMid =/= asn1_NOVALUE ->
+                                                ok;
+                                            Error ->
+                                                d("start_mg -> "
+                                                  "invalid service "
+                                                  "change parms: "
+                                                  "~n   ~p", [SCR]),
+                                               ?ERROR(Error)
+                                        end;
+                                    Error ->
+                                        d("start_mg -> "
+                                          "invalid service change reply: "
+                                          "~n   ~p", [Error]),
+                                        ?ERROR(Error)
+                                end;
+                            Error ->
+                                d("start_mg -> "
+                                  "invalid result: "
+                                  "~n   ~p", [Error]),
+                                ?ERROR(Error)
+                        end;
+                   (Error) ->
+                        d("start_mg -> "
+                          "invalid reply: "
+                          "~n   ~p", [Error]),
+                        ?ERROR(Error)
+                end,
+            lists:map(Verify, MgList);
+        Error -> 
+            d("start_mg -> "
+              "invalid result: "
+              "~n   ~p", [Error]),
+           ?ERROR(Error)
+    end.    
+                
 info() ->
     case (catch megaco:info()) of
 	{'EXIT', _} = Error ->
@@ -171,10 +212,12 @@ users() ->
 
 
 
-d(F,A) ->
-    d(get(dbg),F,A).
+d(F) ->
+    d(F, []).
+d(F, A) ->
+    d(get(dbg), F, A).
 
-d(true,F,A) ->
-    io:format("DBG: " ++ F ++ "~n",A);
+d(true, F, A) ->
+    io:format("DBG: ~s " ++ F ++ "~n", [?FT() | A]);
 d(_, _F, _A) ->
     ok.
diff --git a/lib/megaco/test/megaco_mib_test.erl b/lib/megaco/test/megaco_mib_test.erl
index d644d6bc09..347472bab4 100644
--- a/lib/megaco/test/megaco_mib_test.erl
+++ b/lib/megaco/test/megaco_mib_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2002-2016. 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.
@@ -54,6 +54,7 @@ t(Case) -> megaco_test_lib:t({?MODULE, Case}).
 
 %% Test server callbacks
 init_per_testcase(Case, Config) ->
+    progress("init_per_testcase -> ~w", [Case]),
     process_flag(trap_exit, true),
     case Case of
 	traffic ->
@@ -65,6 +66,7 @@ init_per_testcase(Case, Config) ->
     end.
 
 end_per_testcase(Case, Config) ->
+    progress("end_per_testcase -> ~w", [Case]),
     process_flag(trap_exit, false),
     megaco_test_lib:end_per_testcase(Case, Config).
 
@@ -197,6 +199,7 @@ connect(Config) when is_list(Config) ->
     put(verbosity, ?TEST_VERBOSITY),
     put(sname,     "TEST"),
     i("connect -> starting"),
+    progress("start nodes"),
     MgcNode = make_node_name(mgc),
     Mg1Node = make_node_name(mg1),
     Mg2Node = make_node_name(mg2),
@@ -209,67 +212,85 @@ connect(Config) when is_list(Config) ->
 
     %% Start the MGC and MGs
     ET = [{text,tcp}, {text,udp}, {binary,tcp}, {binary,udp}],
+    progress("start MGC"),
     {ok, Mgc} = 
 	start_mgc(MgcNode, {deviceName, "ctrl"}, ET, ?MGC_VERBOSITY),
+    progress("start MG1"),
     {ok, Mg1} = 
 	start_mg(Mg1Node,  {deviceName, "mg1"}, text,   tcp, ?MG_VERBOSITY),
+    progress("start MG2"),
     {ok, Mg2} = 
 	start_mg(Mg2Node,  {deviceName, "mg2"}, binary, udp, ?MG_VERBOSITY),
 
     %% Collect the initial statistics (should be zero if anything)
+    progress("collect initial MG1 stats"),
     {ok, Mg1Stats0} = get_stats(Mg1, 1),
     d("connect  -> stats for Mg1: ~n~p", [Mg1Stats0]),
+    progress("collect initial MG2 stats"),
     {ok, Mg2Stats0} = get_stats(Mg2, 1),
     d("connect  -> stats for Mg2: ~n~p", [Mg2Stats0]),
+    progress("collect initial MGC stats"),
     {ok, MgcStats0} = get_stats(Mgc, 1),
     d("connect  -> stats for Mgc: ~n~p", [MgcStats0]),
 
     %% Ask Mg1 to do a service change
+    progress("perform MG1 service change"),
     {ok, Res1} = service_change(Mg1),
     d("connect -> (Mg1) service change result: ~p", [Res1]),
 
     %% Collect the statistics
+    progress("collect MG1 statustics (after service change)"),
     {ok, Mg1Stats1} = get_stats(Mg1, 1),
     d("connect  -> stats for Mg1: ~n~p", [Mg1Stats1]),
+    progress("collect MGC statistics (after MG1 service change)"),
     {ok, MgcStats1} = get_stats(Mgc, 1),
     d("connect  -> stats (1) for Mgc: ~n~p", [MgcStats1]),
     {ok, MgcStats2} = get_stats(Mgc, 2),
     d("connect  -> stats (2) for Mgc: ~n~p", [MgcStats2]),
 
     %% Ask Mg2 to do a service change
+    progress("perform MG2 service change"),
     {ok, Res2} = service_change(Mg2),
     d("connect -> (Mg2) service change result: ~p", [Res2]),
 
     %% Collect the statistics
+    progress("collect MG2 statustics (after service change)"),
     {ok, Mg2Stats1} = get_stats(Mg2, 1),
     d("connect  -> stats for Mg1: ~n~p", [Mg2Stats1]),
+    progress("collect MGC statistics (after MG2 service change)"),
     {ok, MgcStats3} = get_stats(Mgc, 1),
     d("connect  -> stats (1) for Mgc: ~n~p", [MgcStats3]),
     {ok, MgcStats4} = get_stats(Mgc, 2),
     d("connect  -> stats (2) for Mgc: ~n~p", [MgcStats4]),
 
     %% Tell Mg1 to stop
+    progress("stop MG1"),
     stop(Mg1),
 
     %% Collect the statistics
+    progress("collect MGC statistics (after MG1 stop)"),
     {ok, MgcStats5} = get_stats(Mgc, 1),
     d("connect  -> stats (1) for Mgc: ~n~p", [MgcStats5]),
     {ok, MgcStats6} = get_stats(Mgc, 2),
     d("connect  -> stats (2) for Mgc: ~n~p", [MgcStats6]),
 
     %% Tell Mg2 to stop
+    progress("stop MG2"),
     stop(Mg2),
 
     %% Collect the statistics
+    progress("collect MGC statistics (after MG2 stop)"),
     {ok, MgcStats7} = get_stats(Mgc, 1),
     d("connect  -> stats (1) for Mgc: ~n~p", [MgcStats7]),
     {ok, MgcStats8} = get_stats(Mgc, 2),
     d("connect  -> stats (2) for Mgc: ~n~p", [MgcStats8]),
 
     %% Tell Mgc to stop
+    progress("stop MGC"),
     stop(Mgc),
 
     i("connect -> done", []),
+    progress("done"),
     ok.
 
 
@@ -284,6 +305,7 @@ traffic(Config) when is_list(Config) ->
     put(verbosity, ?TEST_VERBOSITY),
     put(sname,     "TEST"),
     i("traffic -> starting"),
+    progress("start nodes"),
     MgcNode = make_node_name(mgc),
     Mg1Node = make_node_name(mg1),
     Mg2Node = make_node_name(mg2),
@@ -302,11 +324,13 @@ traffic(Config) when is_list(Config) ->
 
     %% Start the MGC and MGs
     i("traffic -> start the MGC"),    
+    progress("start MGC"),
     ET = [{text,tcp}, {text,udp}, {binary,tcp}, {binary,udp}],
     {ok, Mgc} = 
 	start_mgc(MgcNode, {deviceName, "ctrl"}, ET, ?MGC_VERBOSITY),
 
     i("traffic -> start and connect the MGs"),    
+    progress("start and connect MGs"),
     MgConf0 = [{Mg1Node, "mg1", text,   tcp},
 	       {Mg2Node, "mg2", text,   udp},
 	       {Mg3Node, "mg3", binary, tcp},
@@ -315,36 +339,42 @@ traffic(Config) when is_list(Config) ->
 
     %% Collect and check the MGs statistics
     i("traffic -> collect and check the MGs stats"),    
+    progress("collect and verify MGs (initial) stats"),
     traffic_verify_mg_stats(MgConf, 1, 1),
 
     %% Collect and check the MGC statistics
-    i("traffic -> collect and check the MGC stats"),    
+    i("traffic -> collect and check the MGC (initial) stats"),    
+    progress("collect and verify MGC stats"),
     {ok, MgcStats1} = get_stats(Mgc, 1),
     d("traffic  -> stats (1) for Mgc: ~n~p~n", [MgcStats1]),
     traffic_verify_mgc_stats(Mgc, 1, 1),
 
 
-    sleep(1000),
+    ?SLEEP(1000),
 
 
     %% And apply some load 
-    i("traffic -> apply traffic load"),
+    i("traffic -> apply traffic load (1)"),
+    progress("apply some load (1)"),
     ok = traffic_apply_load(MgConf),
 
     %% Await completion of load part and the collect traffic
-    i("traffic -> await load competion"),
+    i("traffic -> await load (1) competion"),
+    progress("await load (1) completion"),
     ok = traffic_await_load_complete(MgConf),
 
 
-    sleep(1000),
+    ?SLEEP(1000),
 
 
     i("traffic -> collect and check the MGs statistics"),
+    progress("collect and verify MGs (after load 1) stats"),
     traffic_verify_mg_stats(MgConf, 
 			    1 + ?LOAD_COUNTER_START, 
 			    1 + ?LOAD_COUNTER_START),
 
     i("traffic -> collect and check the MGC statistics"),
+    progress("collect and verify MGC (after load 1) stats"),
     {ok, MgcStats3} = get_stats(Mgc, 1),
     d("traffic  -> stats (1) for Mgc: ~n~p~n", [MgcStats3]),
     traffic_verify_mgc_stats(Mgc, 
@@ -352,60 +382,70 @@ traffic(Config) when is_list(Config) ->
 			     1 + ?LOAD_COUNTER_START),
 
 
-    sleep(1000),
+    ?SLEEP(1000),
 
 
     %% Reset counters
     i("traffic -> reset the MGs statistics"),
+    progress("reset MGs stats"),
     traffic_reset_mg_stats(MgConf),
     i("traffic -> collect and check the MGs statistics"),
+    progress("collect and verify MGs (after reset) stats"),
     traffic_verify_mg_stats(MgConf, 0, 0),
 
     i("traffic -> reset the MGC statistics"),
+    progress("reset MGC stats"),
     traffic_reset_mgc_stats(Mgc),
     i("traffic -> collect and check the MGC statistics"),
+    progress("collect and verify MGC (after reset) stats"),
     traffic_verify_mgc_stats(Mgc, 0, 0),
 
 
-    sleep(1000),
+    ?SLEEP(1000),
 
 
     %% And apply some load 
-    i("traffic -> apply traffic load"),
+    i("traffic -> apply traffic load (2)"),
+    progress("apply some load (2)"),
     ok = traffic_apply_load(MgConf),
 
     %% Await completion of load part and the collect traffic
-    i("traffic -> await load competion"),
+    i("traffic -> await load (2) competion"),
+    progress("await load (2) completion"),
     ok = traffic_await_load_complete(MgConf),
 
 
-    sleep(1000),
+    ?SLEEP(1000),
 
 
     i("traffic -> collect and check the MGs statistics"),
+    progress("collect and verify MGs (after load 2) stats"),
     traffic_verify_mg_stats(MgConf, 
 			    ?LOAD_COUNTER_START, 
 			    ?LOAD_COUNTER_START),
 
     i("traffic -> collect and check the MGC statistics"),
+    progress("collect and verify MGC (after load 2) stats"),
     traffic_verify_mgc_stats(Mgc, 
 			     ?LOAD_COUNTER_START, 
 			     ?LOAD_COUNTER_START),
 
 
-    sleep(1000),
+    ?SLEEP(1000),
 
 
     %% Tell MGs to stop
     i("traffic -> stop the MGs"),
+    progress("stop MGs"),
     traffic_stop_mg(MgConf),
 
 
-    sleep(1000),
+    ?SLEEP(1000),
 
 
     %% Collect the statistics
     i("traffic -> collect the MGC statistics"),
+    progress("collect and verify MGC (after MGs stop) stats"),
     {ok, MgcStats7} = get_stats(Mgc, 1),
     d("traffic -> stats (1) for Mgc: ~n~p~n", [MgcStats7]),
     {ok, MgcStats8} = get_stats(Mgc, 2),
@@ -413,9 +453,11 @@ traffic(Config) when is_list(Config) ->
 
     %% Tell Mgc to stop
     i("traffic -> stop the MGC"),
+    progress("stop MGC"),
     stop(Mgc),
 
     i("traffic -> done", []),
+    progress("done"),
     ok.
 
 
@@ -516,10 +558,15 @@ traffic_verify_get_stats(S, Stats) ->
 traffic_verify_counter(Name, Counter, Counters, Expected) ->
     case lists:keysearch(Counter, 1, Counters) of
 	{value, {Counter, Expected}} ->
+            i("counter ~w verified for ~p", [Counter, Name]),
 	    ok;
 	{value, {Counter, Val}} ->
+            i("counter ~w *not* verified for ~p: "
+              "~n   Expected: ~w"
+              "~n   Actual:   ~w", [Counter, Name, Expected, Val]),
 	    exit({illegal_counter_value, Counter, Val, Expected, Name});
 	false ->
+            i("counter ~w *not* found for ~p", [Counter, Name]),
 	    exit({not_found, Counter, Counters, Name, Expected})
     end.
     
@@ -536,8 +583,7 @@ traffic_connect_mg(Node, Name, Coding, Trans) ->
 
     %% Ask the MGs to do a service change
     {ok, Res} = service_change(Pid),
-    d("traffic_connect_mg -> (~s) service change result: ~p", [Name,Res]),
-
+    d("traffic_connect_mg -> (~s) service change result: ~p", [Name, Res]),
     Pid.
 
 
@@ -549,7 +595,9 @@ traffic_get_mg_stats([], Acc) ->
     lists:reverse(Acc);
 traffic_get_mg_stats([{Name, Pid}|Mgs], Acc) ->
     {ok, Stats} = get_stats(Pid, 1),
-    d("traffic_get_mg_stats -> stats for ~s: ~n~p~n", [Name, Stats]),
+    d("traffic_get_mg_stats -> stats for ~s: "
+      "~n   ~p"
+      "~n", [Name, Stats]),
     traffic_get_mg_stats(Mgs, [{Name, Stats}|Acc]).
 
 
@@ -903,7 +951,7 @@ mgc_tcp_create_listen(Sup, Opts, MaxN, N, _InitialReason)
 	ok ->
 	    Sup;
 	{error, {could_not_start_listener, {gen_tcp_listen, eaddrinuse} = Reason}} ->
-	    sleep(N * 200),
+	    ?SLEEP(N * 200),
 	    mgc_tcp_create_listen(Sup, Opts, MaxN, N + 1, Reason);
 	{error, Reason} ->
 	    throw({error, {failed_starting_tcp_listen, Reason}});
@@ -1044,7 +1092,6 @@ mg(Parent, Verbosity, Config) ->
 
 mg_init(Config) ->
     d("mg_init -> entry"),
-    random_init(),
     Mid = get_conf(local_mid, Config),
     RI  = get_conf(receive_info, Config),
     d("mg_init -> start megaco"),
@@ -1088,12 +1135,12 @@ mg_loop(#mg{state = State} = S) ->
 	%% Give me statistics
 	{statistics, 1, Parent} when S#mg.parent == Parent ->
 	    i("mg_loop(~p) -> got request for statistics 1", [State]),
-	    {ok, Gen} = megaco:get_stats(),
-	    CH = S#mg.conn_handle,
-	    Reason = {statistics, CH}, 
-	    Pid = megaco:conn_info(CH, control_pid),
-	    SendMod    = megaco:conn_info(CH, send_mod),
-	    SendHandle = megaco:conn_info(CH, send_handle),
+	    {ok, Gen}   = megaco:get_stats(),
+	    CH          = S#mg.conn_handle,
+	    Reason      = {statistics, CH}, 
+	    Pid         = megaco:conn_info(CH, control_pid),
+	    SendMod     = megaco:conn_info(CH, send_mod),
+	    SendHandle  = megaco:conn_info(CH, send_handle),
 	    {ok, Trans} = 
 		case SendMod of
 		    megaco_tcp -> megaco_tcp:get_stats(SendHandle);
@@ -1247,13 +1294,16 @@ mg_start_udp(MgcPort, RH) ->
     d("start udp transport"),
     case megaco_udp:start_transport() of
 	{ok, Sup} ->
-	    {ok, LocalHost} = inet:gethostname(),
+            %% Some linux (Ubuntu) has "crap" in their /etc/hosts, that 
+            %% causes problem for us in this case (UDP). So we can't use
+            %% local host. Try instead to "figure out" tha actual address...
+            LocalAddr = which_local_addr(),
 	    Opts = [{port, 0}, {receive_handle, RH}],
 	    case megaco_udp:open(Sup, Opts) of
 		{ok, Handle, ControlPid} ->
                     MgcMid = preliminary_mid,
                     SendHandle = megaco_udp:create_send_handle(Handle, 
-							       LocalHost, 
+							       LocalAddr, 
 							       MgcPort),
 		    {ok, ConnHandle} = 
 			megaco:connect(RH, MgcMid, 
@@ -1528,10 +1578,6 @@ request(Pid, Request) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-sleep(X) ->
-    receive after X -> ok end.
-
-
 error_msg(F,A) -> error_logger:error_msg(F ++ "~n",A).
 
 
@@ -1581,6 +1627,44 @@ get_conf(Key, Config) ->
     end.
 
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+which_local_addr() ->
+    case inet:getifaddrs() of
+        {ok, IFs} ->
+            which_local_addr(IFs);
+        {error, Reason} ->
+            i("Failed get local address: "
+              "~n   ~p", [Reason]),
+            ?SKIP({failed_get_local_addr, Reason})
+    end.
+
+which_local_addr([]) ->
+    ?SKIP(failed_get_local_addr);
+which_local_addr([{"lo" = _IfName, _IfOpts}|IFs]) ->
+    which_local_addr(IFs);
+which_local_addr([{"br-" ++ _ = _IfName, _IfOpts}|IFs]) ->
+    which_local_addr(IFs);
+which_local_addr([{"docker" ++ _ = _IfName, _IfOpts}|IFs]) ->
+    which_local_addr(IFs);
+which_local_addr([{_IfName, IfOpts}|IFs]) ->
+    case which_local_addr2(IfOpts) of
+        {ok, Addr} ->
+            Addr;
+        error ->
+            which_local_addr(IFs)
+    end.
+
+
+which_local_addr2([]) ->
+    error;
+which_local_addr2([{addr, Addr}|_]) 
+  when (size(Addr) =:= 4) andalso (element(1, Addr) =/= 127) ->
+    {ok, Addr};
+which_local_addr2([_|T]) ->
+    which_local_addr2(T).
+
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 i(F) ->
@@ -1605,19 +1689,22 @@ print(Severity, Verbosity, P, F, A) ->
     print(printable(Severity,Verbosity), P, F, A).
 
 print(true, P, F, A) ->
-    io:format("~s~p:~s: " ++ F ++ "~n", [P, self(), get(sname) | A]);
+    io:format("~s~p:~s:~s: " ++ F ++ "~n", [P, self(), get(sname), ?FT() | A]);
 print(_, _, _, _) ->
     ok.
 
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+progress(F) ->
+    progress(F, []).
+
+progress(F, A) ->
+    io:format(user, "~s " ++ F ++ "~n", [?FT()|A]).
 
-random_init() ->
-    {A,B,C} = now(),
-    random:seed(A,B,C).
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 random() ->
-    10 * random:uniform(50).
+    10 * rand:uniform(50).
 
 apply_load_timer() ->
     erlang:send_after(random(), self(), apply_load_timeout).
diff --git a/lib/megaco/test/megaco_test_lib.erl b/lib/megaco/test/megaco_test_lib.erl
index 3934a3a957..5fe03b28e3 100644
--- a/lib/megaco/test/megaco_test_lib.erl
+++ b/lib/megaco/test/megaco_test_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1999-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.
@@ -26,7 +26,46 @@
 
 -module(megaco_test_lib).
 
--compile(export_all).
+%% -compile(export_all).
+
+-export([
+         log/4,
+         error/3,
+
+         sleep/1,
+         hours/1, minutes/1, seconds/1,
+         formated_timestamp/0, format_timestamp/1,
+
+         skip/3,
+         non_pc_tc_maybe_skip/4,
+         os_based_skip/1,
+
+         flush/0,
+         still_alive/1,
+         watchdog/2,
+
+         display_alloc_info/0,
+         display_system_info/1, display_system_info/2, display_system_info/3,
+
+         tickets/1,
+         prepare_test_case/5,
+
+         t/1,
+         groups/1,
+         init_suite/2,
+         end_suite/2,
+         init_group/3,
+         end_group/3,
+         t/2,
+         init_per_testcase/2,
+         end_per_testcase/2,
+
+         proxy_start/1, proxy_start/2,
+
+         start_nodes/3
+        ]).
+
+-export([do_eval/4, proxy_init/2]).
 
 -include("megaco_test_lib.hrl").
 
@@ -53,6 +92,13 @@ minutes(N) -> trunc(N * 1000 * 60).
 seconds(N) -> trunc(N * 1000).
 
 
+formated_timestamp() ->
+    format_timestamp(os:timestamp()).
+
+format_timestamp(TS) ->
+    megaco:format_timestamp(TS).
+
+
 %% ----------------------------------------------------------------
 %% Conditional skip of testcases
 %%
@@ -367,7 +413,7 @@ eval(Mod, Fun, Config) ->
     Flag = process_flag(trap_exit, true),
     put(megaco_test_server, true),
     Config2 = Mod:init_per_testcase(Fun, Config),
-    Pid = spawn_link(?MODULE, do_eval, [self(), Mod, Fun, Config2]),
+    Pid = spawn_link(fun() -> do_eval(self(), Mod, Fun, Config2) end),
     R = wait_for_evaluator(Pid, Mod, Fun, Config2, []),
     Mod:end_per_testcase(Fun, Config2),
     erase(megaco_test_server),    
@@ -837,7 +883,7 @@ reset_kill_timer(Config) ->
     end.
 
 watchdog(Pid, Time) ->
-    erlang:now(),
+    _ = os:timestamp(),
     receive
 	stop ->
 	    ok
diff --git a/lib/megaco/test/megaco_test_lib.hrl b/lib/megaco/test/megaco_test_lib.hrl
index 79a1493c40..b198619e2a 100644
--- a/lib/megaco/test/megaco_test_lib.hrl
+++ b/lib/megaco/test/megaco_test_lib.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2016. All Rights Reserved.
+%% Copyright Ericsson AB 1999-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.
@@ -80,9 +80,7 @@
 
 
 -define(SLEEP(MSEC),    megaco_test_lib:sleep(MSEC)).
--define(M(),            megaco_test_lib:millis()).
--define(MDIFF(A,B),     megaco_test_lib:millis_diff(A,B)).
-
 -define(HOURS(T),       megaco_test_lib:hours(T)).
 -define(MINUTES(T),     megaco_test_lib:minutes(T)).
 -define(SECONDS(T),     megaco_test_lib:seconds(T)).
+-define(FT(),           megaco_test_lib:formated_timestamp()).
-- 
2.16.4

Places

File 0721-megaco-test-Improving-the-example-and-mib-test-suite.patch of Package erlang (Revision 4125bb34047926b58204fc1db7993cd3)

Places