File 3681-Add-interactive-shell-suite-logging.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 3681-Add-interactive-shell-suite-logging.patch of Package erlang (Revision bf6cd7f92ad3019d8dc2ad8158b2b053)

Currently displaying revision bf6cd7f92ad3019d8dc2ad8158b2b053 , Show latest

From a23abec106d5763f1704104e3e6606581d7bacd8 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Mon, 20 Dec 2021 17:38:43 +0100
Subject: [PATCH 08/12] Add interactive shell suite logging

---
 lib/kernel/test/interactive_shell_SUITE.erl | 33 +++++++++++----------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/lib/kernel/test/interactive_shell_SUITE.erl b/lib/kernel/test/interactive_shell_SUITE.erl
index df01f106d7..4758f909b7 100644
--- a/lib/kernel/test/interactive_shell_SUITE.erl
+++ b/lib/kernel/test/interactive_shell_SUITE.erl
@@ -758,23 +758,26 @@ remsh_longnames(Config) when is_list(Config) ->
         end,
     case rtstart(" -name " ++ atom_to_list(?FUNCTION_NAME)++Domain) of
         {ok, _SRPid, STPid, SState} ->
-            {ok, _CRPid, CTPid, CState} =
-                rtstart("-name undefined" ++ Domain ++
-                            " -remsh " ++ atom_to_list(?FUNCTION_NAME)),
-            ok = send_commands(
-                   STPid,
-                   [{putline, ""},
-                    {putline, "node()."},
-                    {expect, "\\Q" ++ atom_to_list(?FUNCTION_NAME) ++ "\\E"}], 1),
             try
-                ok = send_commands(
-                       CTPid,
-                       [{putline, ""},
-                        {putline, "node()."},
-                        {expect, "\\Q" ++ atom_to_list(?FUNCTION_NAME) ++ "\\E"} | quit_hosting_node()], 1)
+                {ok, _CRPid, CTPid, CState} =
+                    rtstart("-name undefined" ++ Domain ++
+                                " -remsh " ++ atom_to_list(?FUNCTION_NAME)),
+                try
+                    ok = send_commands(
+                           STPid,
+                           [{putline, ""},
+                            {putline, "node()."},
+                            {expect, "\\Q" ++ atom_to_list(?FUNCTION_NAME) ++ "\\E"}], 1),
+                    ok = send_commands(
+                           CTPid,
+                           [{putline, ""},
+                            {putline, "node()."},
+                            {expect, "\\Q" ++ atom_to_list(?FUNCTION_NAME) ++ "\\E"} | quit_hosting_node()], 1)
+                after
+                    rtnode_dump_logs(rtstop(CState))
+                end
             after
-                rtstop(CState), %% Stop client before server
-                rtstop(SState)
+                rtnode_dump_logs(rtstop(SState))
             end;
         Else ->
             Else
-- 
2.31.1

Places

File 3681-Add-interactive-shell-suite-logging.patch of Package erlang (Revision bf6cd7f92ad3019d8dc2ad8158b2b053)

Places