Merge branch 'maint'

1 files changed, 9 insertions, 11 deletions

diff --git a/lib/diameter/test/diameter_traffic_SUITE.erl b/lib/diameter/test/diameter_traffic_SUITE.erl
index 4b67372016..03815f283e 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.