File 0493-megaco-test-mess-Use-try-tc-for-test-case.... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0493-megaco-test-mess-Use-try-tc-for-test-case.patch of Package erlang (Revision 2b70b065003482368e5c337a61b47757)

Currently displaying revision 2b70b065003482368e5c337a61b47757 , Show latest

From 8ce73d9cf617d41ac78f1e3341155260c9ceadec Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Fri, 23 Sep 2022 18:21:53 +0200
Subject: [PATCH 2/3] [megaco|test|mess] Use try-tc for test case

---
 lib/megaco/test/megaco_mess_SUITE.erl | 36 +++++++++++++--------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/lib/megaco/test/megaco_mess_SUITE.erl b/lib/megaco/test/megaco_mess_SUITE.erl
index 9ff3ac1468..3c9c608a1a 100644
--- a/lib/megaco/test/megaco_mess_SUITE.erl
+++ b/lib/megaco/test/megaco_mess_SUITE.erl
@@ -11453,11 +11453,25 @@ otp_6865_request_and_reply_plain_extra2(suite) ->
 otp_6865_request_and_reply_plain_extra2(doc) ->
     [];
 otp_6865_request_and_reply_plain_extra2(Config) when is_list(Config) ->
-    put(verbosity, ?TEST_VERBOSITY),
-    put(sname,     "TEST"),
-    put(tc,        otp6865e2),
-    i("starting"),
+    Pre = fun() ->
+                  MgcNode = make_node_name(mgc),
+                  MgNode  = make_node_name(mg),
+                  d("start nodes: "
+                    "~n   MgcNode: ~p"
+                    "~n   MgNode:  ~p", 
+                    [MgcNode, MgNode]),
+                  Nodes = [MgcNode, MgNode],
+                  ok = ?START_NODES(Nodes, true),
+                  Nodes
+          end,
+    Case = fun do_otp_6865_request_and_reply_plain_extra2/1,
+    Post = fun(Nodes) ->
+                   d("stop nodes"),
+                   ?STOP_NODES(lists:reverse(Nodes))
+           end,
+    try_tc(otp6865e2, Pre, Case, Post).
 
+do_otp_6865_request_and_reply_plain_extra2([MgcNode, MgNode]) ->
     d("start tc controller"),
     ok = megaco_tc_controller:start_link(),
 
@@ -11466,16 +11480,6 @@ otp_6865_request_and_reply_plain_extra2(Config) when is_list(Config) ->
     ExtraInfo = otp6865e2_extra_info, 
     ok = megaco_tc_controller:insert(extra_transport_info, ExtraInfo),
 
-    MgcNode = make_node_name(mgc),
-    MgNode  = make_node_name(mg),
-    d("start nodes: "
-      "~n   MgcNode: ~p"
-      "~n   MgNode:  ~p", 
-      [MgcNode, MgNode]),
-    Nodes = [MgcNode, MgNode],
-    ok = ?START_NODES(Nodes, true),
-
-
     d("[MGC] start the simulator "),
     {ok, Mgc} = megaco_test_megaco_generator:start_link("MGC", MgcNode),
 
@@ -11521,10 +11525,6 @@ otp_6865_request_and_reply_plain_extra2(Config) when is_list(Config) ->
     i("stop tc controller"),
     ok = megaco_tc_controller:stop(),
 
-    %% Cleanup
-    d("stop nodes"),
-    ?STOP_NODES(lists:reverse(Nodes)),
-
     i("done", []),
     ok.
 
-- 
2.35.3

Places

File 0493-megaco-test-mess-Use-try-tc-for-test-case.patch of Package erlang (Revision 2b70b065003482368e5c337a61b47757)

Places