Merge branch 'bjorn/kernel/rpc/OTP-13409'

* bjorn/kernel/rpc/OTP-13409:
  Don't throw exceptions from rpc:call() and rpc:block_call()
  Reduce code duplication in called_node_dies/1 and friends

2 files changed, 34 insertions, 46 deletions

diff --git a/lib/kernel/src/rpc.erl b/lib/kernel/src/rpc.erl
index d3db8eb80a..b9284487d2 100644
--- a/lib/kernel/src/rpc.erl
+++ b/lib/kernel/src/rpc.erl
@@ -357,8 +357,12 @@ do_call(Node, Request, Timeout) ->
 rpc_check_t({'EXIT', {timeout,_}}) -> {badrpc, timeout};
 rpc_check_t(X) -> rpc_check(X).
 	    
-rpc_check({'EXIT', {{nodedown,_},_}}) -> {badrpc, nodedown};
-rpc_check({'EXIT', X}) -> exit(X);
+rpc_check({'EXIT', {{nodedown,_},_}}) ->
+    {badrpc, nodedown};
+rpc_check({'EXIT', _}=Exit) ->
+    %% Should only happen if the rex process on the other node
+    %% died.
+    {badrpc, Exit};
 rpc_check(X) -> X.
 
 
diff --git a/lib/kernel/test/rpc_SUITE.erl b/lib/kernel/test/rpc_SUITE.erl
index 77b85f39e0..101cff7ed2 100644
--- a/lib/kernel/test/rpc_SUITE.erl
+++ b/lib/kernel/test/rpc_SUITE.erl
@@ -348,66 +348,50 @@ suicide(Mod, Func, Args) ->
 
 called_node_dies(Config) when is_list(Config) ->
     PA = filename:dirname(code:which(?MODULE)),
-    %%
+
     node_rep(
-      fun (Tag, Call, Args) ->
-	      {Tag,{badrpc,nodedown}} =
-		  {Tag,apply(rpc, Call, Args)}
+      fun (Call, Args) ->
+	      {badrpc,nodedown} = apply(rpc, Call, Args)
       end, "rpc_SUITE_called_node_dies_1",
       PA, ?MODULE, suicide, [erlang,halt,[]]),
+
     node_rep(
-      fun (Tag, Call, Args) ->
-	      {Tag,{badrpc,nodedown}} =
-		  {Tag,apply(rpc, Call, Args)}
+      fun (Call, Args) ->
+	      {badrpc,nodedown} = apply(rpc, Call, Args)
       end, "rpc_SUITE_called_node_dies_2",
       PA, ?MODULE, suicide, [init,stop,[]]),
+
     node_rep(
-      fun (Tag, Call, Args=[_|_]) ->
-	      {Tag,{'EXIT',{killed,_}}} =
-		  {Tag,catch {noexit,apply(rpc, Call, Args)}}
+      fun (Call, Args=[_|_]) ->
+	      {badrpc,{'EXIT',{killed,_}}} = apply(rpc, Call, Args)
       end, "rpc_SUITE_called_node_dies_3",
       PA, ?MODULE, suicide, [erlang,exit,[rex,kill]]),
+
     node_rep(
-      fun %% Cannot block call rpc - will hang
-	  (_Tag, block_call, _Args) -> ok;
-	  (Tag, Call, Args=[_|_]) ->
-		    {Tag,{'EXIT',{normal,_}}} = 
-			{Tag,catch {noexit,apply(rpc, Call, Args)}}
-	    end, "rpc_SUITE_called_node_dies_4", 
+      fun (block_call, _Args) ->
+	      %% Cannot block call rpc - will hang
+	      ok;
+	  (Call, Args=[_|_]) ->
+	      {badrpc,{'EXIT',{normal,_}}} = apply(rpc, Call, Args)
+      end, "rpc_SUITE_called_node_dies_4",
       PA, ?MODULE, suicide, [rpc,stop,[]]),
-    %%
+
     ok.
 
 node_rep(Fun, Name, PA, M, F, A) ->
-    {ok, Na} = test_server:start_node(list_to_atom(Name++"_a"), slave,
-				      [{args, "-pa " ++ PA}]),
-    Fun(a, call, [Na, M, F, A]),
-    catch test_server:stop_node(Na),
-    {ok, Nb} = test_server:start_node(list_to_atom(Name++"_b"), slave,
-				      [{args, "-pa " ++ PA}]),
-    Fun(b, call, [Nb, M, F, A, infinity]),
-    catch test_server:stop_node(Nb),
-    {ok, Nc} = test_server:start_node(list_to_atom(Name++"_c"), slave,
-				      [{args, "-pa " ++ PA}]),
-    Fun(c, call, [Nc, M, F, A, infinity]),
-    catch test_server:stop_node(Nc),
-    %%
-    {ok, Nd} = test_server:start_node(list_to_atom(Name++"_d"), slave,
-				      [{args, "-pa " ++ PA}]),
-    Fun(d, block_call, [Nd, M, F, A]),
-    catch test_server:stop_node(Nd),
-    {ok, Ne} = test_server:start_node(list_to_atom(Name++"_e"), slave,
-				      [{args, "-pa " ++ PA}]),
-    Fun(e, block_call, [Ne, M, F, A, infinity]),
-    catch test_server:stop_node(Ne),
-    {ok, Nf} = test_server:start_node(list_to_atom(Name++"_f"), slave,
-				      [{args, "-pa " ++ PA}]),
-    Fun(f, block_call, [Nf, M, F, A, infinity]),
-    catch test_server:stop_node(Nf),
+    node_rep_call(a, call, [M,F,A], Fun, Name, PA),
+    node_rep_call(b, call, [M,F,A,infinity], Fun, Name, PA),
+    node_rep_call(c, block_call, [M,F,A], Fun, Name, PA),
+    node_rep_call(d, block_call, [M,F,A,infinity], Fun, Name, PA).
+
+node_rep_call(Tag, Call, Args, Fun, Name0, PA) ->
+    Name = list_to_atom(Name0 ++ "_" ++ atom_to_list(Tag)),
+    {ok, N} = test_server:start_node(Name, slave,
+				     [{args, "-pa " ++ PA}]),
+    Fun(Call, [N|Args]),
+    catch test_server:stop_node(N),
     ok.
 
-
-
 %% OTP-3766.
 called_throws(Config) when is_list(Config) ->
     PA = filename:dirname(code:which(?MODULE)),