3 files changed, 28 insertions, 26 deletions

diff --git a/lib/diameter/test/diameter_gen_sctp_SUITE.erl b/lib/diameter/test/diameter_gen_sctp_SUITE.erl
index 1e2baa79b3..4ea5e80095 100644
--- a/lib/diameter/test/diameter_gen_sctp_SUITE.erl
+++ b/lib/diameter/test/diameter_gen_sctp_SUITE.erl
@@ -119,10 +119,10 @@ send_not_from_controlling_process(_) ->
 
 send_not_from_controlling_process() ->
     FPid = self(),
-    {L, MRef} = spawn_monitor(fun() -> listen(FPid) end),%% listening process
+    {L, MRef} = spawn_monitor(fun() -> listen(FPid) end),
     receive
         {?MODULE, C, S} ->
-            erlang:demonitor(MRef, [flush]),
+            demonitor(MRef, [flush]),
             [L,C,S];
         {'DOWN', MRef, process, _, _} = T ->
             error(T)
@@ -137,13 +137,7 @@ listen(FPid) ->
     LPid = self(),
     spawn(fun() -> connect1(PortNr, FPid, LPid) end), %% connecting process
     Id = assoc(Sock),
-    ?SCTP(Sock, {[#sctp_sndrcvinfo{assoc_id = Id}], _Bin})
-        = recv(). %% Waits with this as current_function.
-
-%% recv/0
-
-recv() ->
-    receive T -> T end.
+    recv(Sock, Id).
 
 %% connect1/3
 
@@ -154,7 +148,7 @@ connect1(PortNr, FPid, LPid) ->
     FPid ! {?MODULE,
             self(),
             spawn(fun() -> send(Sock, Id) end)}, %% sending process
-    MRef = erlang:monitor(process, LPid),
+    MRef = monitor(process, LPid),
     down(MRef).  %% Waits with this as current_function.
 
 %% down/1
@@ -277,7 +271,8 @@ acc(N, Acc) ->
 
 loop(Sock, MRef, Bin) ->
     receive
-        ?SCTP(Sock, {[#sctp_sndrcvinfo{assoc_id = Id}], B}) ->
+        ?SCTP(Sock, {[#sctp_sndrcvinfo{assoc_id = Id}], B})
+          when is_binary(B) ->
             Sz = size(Bin),
             {Sz, Bin} = {size(B), B},  %% assert
             ok = send(Sock, Id, mark(Bin)),
@@ -291,7 +286,7 @@ loop(Sock, MRef, Bin) ->
 %% connect2/3
 
 connect2(Pid, PortNr, Bin) ->
-    erlang:monitor(process, Pid),
+    monitor(process, Pid),
 
     {ok, Sock} = open(),
     ok = gen_sctp:connect_init(Sock, ?ADDR, PortNr, []),
@@ -312,9 +307,14 @@ connect2(Pid, PortNr, Bin) ->
 
 recv(Sock, Id) ->
     receive
-        ?SCTP(Sock, {[#sctp_sndrcvinfo{assoc_id = Id}], Bin}) ->
+        ?SCTP(Sock, {[#sctp_sndrcvinfo{assoc_id = I}], Bin})
+          when is_binary(Bin) ->
+            Id = I,   %% assert
             Bin;
-        T ->  %% eg. 'DOWN'
+        ?SCTP(S, _) ->
+            Sock = S, %% assert
+            recv(Sock, Id);
+        T ->
             exit(T)
     end.
 
diff --git a/lib/diameter/test/diameter_traffic_SUITE.erl b/lib/diameter/test/diameter_traffic_SUITE.erl
index 318057b1b2..9822b95301 100644
--- a/lib/diameter/test/diameter_traffic_SUITE.erl
+++ b/lib/diameter/test/diameter_traffic_SUITE.erl
@@ -414,12 +414,13 @@ send_eval(Config) ->
         = call(Config, Req).
 
 %% Send an accounting ACR that the server tries to answer with an
-%% inappropriate header, resulting in no answer being sent and the
-%% request timing out.
+%% inappropriate header. That the error is detected is coded in
+%% handle_answer.
 send_bad_answer(Config) ->
     Req = ['ACR', {'Accounting-Record-Type', ?EVENT_RECORD},
                   {'Accounting-Record-Number', 2}],
-    {timeout, _} = call(Config, Req).
+    ?answer_message(?SUCCESS)
+        = call(Config, Req).
 
 %% Send an ACR that the server callback answers explicitly with a
 %% protocol error.
@@ -1057,15 +1058,12 @@ answer(Pkt, Req, _Peer, Name, #group{client_dict0 = Dict0}) ->
     [R | Vs] = Dict:'#get-'(answer(Ans, Es, Name)),
     [Dict:rec2msg(R) | Vs].
 
-answer(Rec, [_|_], N)
-  when N == send_long_avp_length;
-       N == send_short_avp_length;
-       N == send_zero_avp_length;
-       N == send_invalid_avp_length;
-       N == send_invalid_reject;
-       N == send_unknown_short_mandatory;
-       N == send_unexpected_mandatory_decode ->
+%% An inappropriate E-bit results in a decode error ...
+answer(Rec, Es, send_bad_answer) ->
+    [{5004, #diameter_avp{name = 'Result-Code'}} | _] = Es,
     Rec;
+
+%% ... while other errors are reflected in Failed-AVP.
 answer(Rec, [], _) ->
     Rec.
 
diff --git a/lib/diameter/test/diameter_transport_SUITE.erl b/lib/diameter/test/diameter_transport_SUITE.erl
index 1e61bbdbf7..f098851bea 100644
--- a/lib/diameter/test/diameter_transport_SUITE.erl
+++ b/lib/diameter/test/diameter_transport_SUITE.erl
@@ -424,7 +424,11 @@ gen_send(tcp, Sock, Bin) ->
 
 gen_recv(sctp, Sock) ->
     {_OS, _IS, Id} = getr(assoc),
-    ?RECV(?SCTP(Sock, {[#sctp_sndrcvinfo{assoc_id = Id}], Bin}), Bin);
+    receive
+        ?SCTP(Sock, {[#sctp_sndrcvinfo{assoc_id = Id}], Bin})
+          when is_binary(Bin) ->
+            Bin
+    end;
 gen_recv(tcp, Sock) ->
     tcp_recv(Sock, <<>>).