yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test(sessmem): drop unnecessary nesting in testcase 

Also get rid of sneaky binding assignment.
This commit is contained in:
Andrew Mayorov 2023-09-19 18:03:32 +04:00
parent 98706cd215
commit 9362ef6f73
No known key found for this signature in database
GPG Key ID: 2837C62ACFBFED5D
1 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
apps/emqx/test/emqx_session_mem_SUITE.erl
View File

@ -178,38 +178,36 @@ t_publish_qos2_with_error_return(_) ->
ok ok
end), end),
Session = session(#{max_awaiting_rel => 2, awaiting_rel => #{PacketId1 = 1 => ts(millisecond)}}), PacketId1 = 1,
begin Session = session(#{max_awaiting_rel => 2, awaiting_rel => #{PacketId1 => ts(millisecond)}}),
Msg1 = emqx_message:make(clientid, ?QOS_2, <<"t">>, <<"payload1">>), Msg1 = emqx_message:make(clientid, ?QOS_2, <<"t">>, <<"payload1">>),
{error, RC1 = ?RC_PACKET_IDENTIFIER_IN_USE} = emqx_session:publish( {error, RC1 = ?RC_PACKET_IDENTIFIER_IN_USE} = emqx_session:publish(
clientinfo(), PacketId1, Msg1, Session clientinfo(), PacketId1, Msg1, Session
), ),
receive receive
{'message.dropped', Reason1, RecMsg1} -> {'message.dropped', Reason1, RecMsg1} ->
?assertEqual(Reason1, emqx_reason_codes:name(RC1)), ?assertEqual(Reason1, emqx_reason_codes:name(RC1)),
?assertEqual(RecMsg1, Msg1) ?assertEqual(RecMsg1, Msg1)
after 1000 -> after 1000 ->
ct:fail(?FUNCTION_NAME) ct:fail(?FUNCTION_NAME)
end
end, end,
begin Msg2 = emqx_message:make(clientid, ?QOS_2, <<"t">>, <<"payload2">>),
Msg2 = emqx_message:make(clientid, ?QOS_2, <<"t">>, <<"payload2">>), {ok, [], Session1} = emqx_session:publish(
{ok, [], Session1} = emqx_session:publish( clientinfo(), _PacketId2 = 2, Msg2, Session
clientinfo(), _PacketId2 = 2, Msg2, Session ),
), ?assertEqual(2, emqx_session_mem:info(awaiting_rel_cnt, Session1)),
?assertEqual(2, emqx_session_mem:info(awaiting_rel_cnt, Session1)), {error, RC2 = ?RC_RECEIVE_MAXIMUM_EXCEEDED} = emqx_session:publish(
{error, RC2 = ?RC_RECEIVE_MAXIMUM_EXCEEDED} = emqx_session:publish( clientinfo(), _PacketId3 = 3, Msg2, Session1
clientinfo(), _PacketId3 = 3, Msg2, Session1 ),
), receive
receive {'message.dropped', Reason2, RecMsg2} ->
{'message.dropped', Reason2, RecMsg2} -> ?assertEqual(Reason2, emqx_reason_codes:name(RC2)),
?assertEqual(Reason2, emqx_reason_codes:name(RC2)), ?assertEqual(RecMsg2, Msg2)
?assertEqual(RecMsg2, Msg2) after 1000 ->
after 1000 -> ct:fail(?FUNCTION_NAME)
ct:fail(?FUNCTION_NAME)
end
end, end,
ok = meck:expect(emqx_hooks, run, fun(_Hook, _Args) -> ok end). ok = meck:expect(emqx_hooks, run, fun(_Hook, _Args) -> ok end).
t_is_awaiting_full_false(_) -> t_is_awaiting_full_false(_) ->