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

fix(test): always init session with zone and listener names

This commit is contained in:
Shawn 2021-07-12 16:00:04 +08:00
parent ea68beeef6
commit 88638da287
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/emqx/test/emqx_channel_SUITE.erl
View File

@ -624,7 +624,7 @@ t_handle_deliver_nl(_) ->
Channel = channel(#{clientinfo => ClientInfo, session => Session}), Channel = channel(#{clientinfo => ClientInfo, session => Session}),
Msg = emqx_message:make(<<"clientid">>, ?QOS_1, <<"t1">>, <<"qos1">>), Msg = emqx_message:make(<<"clientid">>, ?QOS_1, <<"t1">>, <<"qos1">>),
NMsg = emqx_message:set_flag(nl, Msg), NMsg = emqx_message:set_flag(nl, Msg),
{ok, Channel} = emqx_channel:handle_deliver([{deliver, <<"t1">>, NMsg}], Channel). {ok, _} = emqx_channel:handle_deliver([{deliver, <<"t1">>, NMsg}], Channel).
%%-------------------------------------------------------------------- %%--------------------------------------------------------------------
%% Test cases for handle_out %% Test cases for handle_out
@ -973,7 +973,8 @@ session(InitFields) when is_map(InitFields) ->
maps:fold(fun(Field, Value, Session) -> maps:fold(fun(Field, Value, Session) ->
emqx_session:set_field(Field, Value, Session) emqx_session:set_field(Field, Value, Session)
end, end,
emqx_session:init(#{zone => channel}, #{receive_maximum => 0}), emqx_session:init(#{zone => default, listener => mqtt_tcp},
#{receive_maximum => 0}),
InitFields). InitFields).
%% conn: 5/s; overall: 10/s %% conn: 5/s; overall: 10/s

6
apps/emqx/test/emqx_session_SUITE.erl
View File

@ -50,7 +50,8 @@ end_per_testcase(_TestCase, Config) ->
%%-------------------------------------------------------------------- %%--------------------------------------------------------------------
t_session_init(_) -> t_session_init(_) ->
Session = emqx_session:init(#{zone => zone}, #{receive_maximum => 64}), Session = emqx_session:init(#{zone => default, listener => mqtt_tcp},
#{receive_maximum => 64}),
?assertEqual(#{}, emqx_session:info(subscriptions, Session)), ?assertEqual(#{}, emqx_session:info(subscriptions, Session)),
?assertEqual(0, emqx_session:info(subscriptions_cnt, Session)), ?assertEqual(0, emqx_session:info(subscriptions_cnt, Session)),
?assertEqual(0, emqx_session:info(subscriptions_max, Session)), ?assertEqual(0, emqx_session:info(subscriptions_max, Session)),
@ -375,7 +376,8 @@ session(InitFields) when is_map(InitFields) ->
maps:fold(fun(Field, Value, Session) -> maps:fold(fun(Field, Value, Session) ->
emqx_session:set_field(Field, Value, Session) emqx_session:set_field(Field, Value, Session)
end, end,
emqx_session:init(#{zone => channel}, #{receive_maximum => 0}), emqx_session:init(#{zone => default, listener => mqtt_tcp},
#{receive_maximum => 0}),
InitFields). InitFields).

2
apps/emqx/test/emqx_ws_connection_SUITE.erl
View File

@ -502,7 +502,7 @@ channel(InitFields) ->
peercert => undefined, peercert => undefined,
mountpoint => undefined mountpoint => undefined
}, },
Session = emqx_session:init(#{zone => external}, Session = emqx_session:init(#{zone => default, listener => mqtt_tcp},
#{receive_maximum => 0} #{receive_maximum => 0}
), ),
maps:fold(fun(Field, Value, Channel) -> maps:fold(fun(Field, Value, Channel) ->