File 0160-kernel-esock-test-Tweaking-to-failed-node-start.patch of Package erlang
From c615ac18598923938923972ca6ddd98c2ed4c397 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Thu, 25 Mar 2021 13:54:16 +0100
Subject: [PATCH] [kernel|esock|test] Tweaking to failed node start
A node start failed and this *should* result in a skip.
And from the logs its clear that the test case returns
{skip, Reason}. Still, the test case fails with:
Error detected: test case aborted or killed
So, add some more printouts to see what is actually going on...
---
lib/kernel/test/socket_SUITE.erl | 15 ++++++++++-----
lib/kernel/test/socket_test_evaluator.erl | 16 ++++++++--------
2 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/lib/kernel/test/socket_SUITE.erl b/lib/kernel/test/socket_SUITE.erl
index 2ec9227a84..6f5e778047 100644
--- a/lib/kernel/test/socket_SUITE.erl
+++ b/lib/kernel/test/socket_SUITE.erl
@@ -28079,11 +28079,16 @@ sc_rc_receive_response_tcp(InitState) ->
%% *** Init part ***
#{desc => "create node",
cmd => fun(#{host := Host, node_id := NodeID} = State) ->
- case start_node(Host, l2a(f("client_~w", [NodeID]))) of
+ case start_node(Host,
+ l2a(f("client_~w", [NodeID]))) of
{ok, Node} ->
- ?SEV_IPRINT("client node ~p started", [Node]),
+ ?SEV_IPRINT("client node ~p started",
+ [Node]),
{ok, State#{node => Node}};
{error, Reason} ->
+ ?SEV_EPRINT("failed starting "
+ "client node ~p (=> SKIP):"
+ "~n ~p", [NodeID, Reason]),
{skip, Reason}
end
end},
@@ -28495,9 +28500,9 @@ sc_rc_receive_response_tcp(InitState) ->
Tester = ?SEV_START("tester", TesterSeq, TesterInitState),
i("await evaluator"),
- ok = ?SEV_AWAIT_FINISH([Server,
- Client1, Client2, Client3,
- Tester]).
+ ?line ok = ?SEV_AWAIT_FINISH([Server,
+ Client1, Client2, Client3,
+ Tester]).
sc_rc_tcp_client_start(Node) ->
diff --git a/lib/kernel/test/socket_test_evaluator.erl b/lib/kernel/test/socket_test_evaluator.erl
index 694f0d5f1e..76139bd3a2 100644
--- a/lib/kernel/test/socket_test_evaluator.erl
+++ b/lib/kernel/test/socket_test_evaluator.erl
@@ -281,16 +281,16 @@ await_evs_termination([], _Timeout) ->
await_evs_termination(Evs, Timeout) ->
T = t(),
receive
- {'DOWN', _MRef, process, Pid, _Reason} ->
- %% ?SEV_IPRINT("await_evs_termination -> DOWN: "
- %% "~n Pid: ~p"
- %% "~n Reason: ~p", [Pid, Reason]),
+ {'DOWN', _MRef, process, Pid, Reason} ->
+ ?SEV_IPRINT("await_evs_termination -> DOWN: "
+ "~n Pid: ~p"
+ "~n Reason: ~p", [Pid, Reason]),
Evs2 = lists:keydelete(Pid, #ev.pid, Evs),
await_evs_termination(Evs2, tdiff(T, t()));
- {'EXIT', Pid, _Reason} ->
- %% ?SEV_IPRINT("await_evs_termination -> EXIT: "
- %% "~n Pid: ~p"
- %% "~n Reason: ~p", [Pid, Reason]),
+ {'EXIT', Pid, Reason} ->
+ ?SEV_IPRINT("await_evs_termination -> EXIT: "
+ "~n Pid: ~p"
+ "~n Reason: ~p", [Pid, Reason]),
Evs2 = lists:keydelete(Pid, #ev.pid, Evs),
await_evs_termination(Evs2, tdiff(T, t()))
--
2.26.2