File 0375-megaco-examples-test-Mre-tweaking-to-detec... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0375-megaco-examples-test-Mre-tweaking-to-detect-flex-loa.patch of Package erlang (Revision 57cf7c87cb80e2aaaf3f20327bf57529)

Currently displaying revision 57cf7c87cb80e2aaaf3f20327bf57529 , Show latest

From 17b924fae29e47403a9fc1dab861cf02064dee6e Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Tue, 11 Jan 2022 12:26:28 +0100
Subject: [PATCH 05/13] [megaco|examples|test] Mre tweaking to detect flex load
 failure

OTP-17839
---
 .../examples/meas/megaco_codec_mstone2.erl    | 34 ++++++++++++-------
 lib/megaco/test/megaco_examples_SUITE.erl     | 27 +++++++++++----
 2 files changed, 42 insertions(+), 19 deletions(-)

diff --git a/lib/megaco/examples/meas/megaco_codec_mstone2.erl b/lib/megaco/examples/meas/megaco_codec_mstone2.erl
index d0c376a0a7..d1f033dc6a 100644
--- a/lib/megaco/examples/meas/megaco_codec_mstone2.erl
+++ b/lib/megaco/examples/meas/megaco_codec_mstone2.erl
@@ -168,12 +168,14 @@ mstone_init(RunTime, Mode, MessagePackage) ->
 			       end)),
     receive
 	{'DOWN', Ref, process, _Pid, {done, Result}} ->
-	    display_result(Result);
+	    display_result(Result),
+            ok;
+
 	{'DOWN', Ref, process, _Pid, Result} ->
 	    io:format("Unexpected result:"
                       "~n      ~p"
                       "~n", [Result]),
-	    ok
+	    Result
     end.
 
 
@@ -270,17 +272,23 @@ loader(RunTime, Mode, Codecs, MessagePackage) ->
 init(RunTime, Mode, Codecs, MessagePackage) ->
     ets:new(mstone, [set, private, named_table, {keypos, 1}]),
     ets:insert(mstone, {worker_cnt, 0}),
-    {Pid, FlexConf} = ?LIB:start_flex_scanner(),
-    io:format("prepare messages", []),
-    EMessages = ?LIB:expanded_messages(MessagePackage, Codecs, Mode), 
-    io:format("~ninit codec data", []),
-    CodecData = init_codec_data(EMessages, FlexConf),
-    Timer = erlang:send_after(RunTime, self(), mstone_finished), 
-    io:format("~n", []),
-    {ok, #state{timer        = Timer, 
-		idle         = CodecData, 
-		flex_handler = Pid, 
-		flex_conf    = FlexConf}}.
+    case ?LIB:start_flex_scanner() of
+        {Pid, FlexConf} when is_pid(Pid) ->
+            io:format("prepare messages", []),
+            EMessages = ?LIB:expanded_messages(MessagePackage, Codecs, Mode), 
+            io:format("~ninit codec data", []),
+            CodecData = init_codec_data(EMessages, FlexConf),
+            Timer = erlang:send_after(RunTime, self(), mstone_finished), 
+            io:format("~n", []),
+            {ok, #state{timer        = Timer, 
+                        idle         = CodecData, 
+                        flex_handler = Pid, 
+                        flex_conf    = FlexConf}};
+        {error, Reason} = ERROR ->
+            io:format("<ERROR> Failed starting flex scanner: "
+                      "~n      ~p", [Reason]),
+            ERROR
+    end.
 
 init_codec_data(EMsgs, FlexConf) ->
     [init_codec_data(Codec, Mod, Conf, Msgs, FlexConf) || 
diff --git a/lib/megaco/test/megaco_examples_SUITE.erl b/lib/megaco/test/megaco_examples_SUITE.erl
index df0a76e0ec..25ba8b9107 100644
--- a/lib/megaco/test/megaco_examples_SUITE.erl
+++ b/lib/megaco/test/megaco_examples_SUITE.erl
@@ -158,8 +158,13 @@ init_per_testcase(meas = Case, Config) ->
       "~n   Config: ~p"
       "~n   Nodes:  ~p", [Config, erlang:nodes()]),
 
-    megaco_test_global_sys_monitor:reset_events(),
-    init_per_testcase_meas(Case, example_meas_meas_modules(), Config);
+    case megaco_flex_scanner:is_enabled() of
+        true ->
+            megaco_test_global_sys_monitor:reset_events(),
+            init_per_testcase_meas(Case, example_meas_meas_modules(), Config);
+        false ->
+            ?SKIP(flex_scanner_not_enabled)
+    end;
 
 init_per_testcase(mstone1 = Case, Config) ->
 
@@ -167,8 +172,13 @@ init_per_testcase(mstone1 = Case, Config) ->
       "~n   Config: ~p"
       "~n   Nodes:  ~p", [Config, erlang:nodes()]),
 
-    megaco_test_global_sys_monitor:reset_events(),
-    init_per_testcase_meas(Case, example_meas_mstone1_modules(), Config);
+    case megaco_flex_scanner:is_enabled() of
+        true ->
+            megaco_test_global_sys_monitor:reset_events(),
+            init_per_testcase_meas(Case, example_meas_mstone1_modules(), Config);
+        false ->
+            ?SKIP(flex_scanner_not_enabled)
+    end;
 
 init_per_testcase(mstone2 = Case, Config) ->
 
@@ -176,8 +186,13 @@ init_per_testcase(mstone2 = Case, Config) ->
       "~n   Config: ~p"
       "~n   Nodes:  ~p", [Config, erlang:nodes()]),
 
-    megaco_test_global_sys_monitor:reset_events(),
-    init_per_testcase_meas(Case, example_meas_mstone2_modules(), Config).
+    case megaco_flex_scanner:is_enabled() of
+        true ->
+            megaco_test_global_sys_monitor:reset_events(),
+            init_per_testcase_meas(Case, example_meas_mstone2_modules(), Config);
+        false ->
+            ?SKIP(flex_scanner_not_enabled)
+    end.
 
 
 init_per_testcase_meas(Case, Mods, Config) ->
-- 
2.31.1

Places

File 0375-megaco-examples-test-Mre-tweaking-to-detect-flex-loa.patch of Package erlang (Revision 57cf7c87cb80e2aaaf3f20327bf57529)

Places