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

test: fix session downgrade/upgrade in tests

This commit is contained in:
Zaiming (Stone) Shi 2022-03-18 17:57:17 +01:00
parent 21ed258d58
commit d56650e78b
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/emqx_session.erl
View File

@ -165,6 +165,7 @@
-ifdef(TEST). -ifdef(TEST).
-define(GET_CLIENT_ID(C), maps:get(clientid, C, <<>>)). -define(GET_CLIENT_ID(C), maps:get(clientid, C, <<>>)).
-export([dummy/0]).
-else. -else.
-define(GET_CLIENT_ID(C), maps:get(clientid, C)). -define(GET_CLIENT_ID(C), maps:get(clientid, C)).
-endif. -endif.
@ -200,14 +201,20 @@ init_mqueue(Zone) ->
%% @doc uprade from 4.3 %% @doc uprade from 4.3
upgrade(CInfo, S) -> upgrade(CInfo, S) ->
?LOG(warning, "upgrading from 4.3", []),
[session | Fields] = tuple_to_list(S), [session | Fields] = tuple_to_list(S),
#session{} = list_to_tuple([session, ?GET_CLIENT_ID(CInfo) | Fields] ++ [#{}]). #session{} = list_to_tuple([session, ?GET_CLIENT_ID(CInfo) | Fields] ++ [#{}]).
%% @doc Downgrade to 4.3 %% @doc Downgrade to 4.3
downgrade(#session{} = S) -> downgrade(#session{} = S) ->
?LOG(warning, "downgrading to 4.3", []),
[session, _ClientID | Fields] = tuple_to_list(S), [session, _ClientID | Fields] = tuple_to_list(S),
list_to_tuple([session | lists:reverse(tl(lists:reverse(Fields)))]). list_to_tuple([session | lists:reverse(tl(lists:reverse(Fields)))]).
-ifdef(TEST).
dummy() ->
#session{}.
-endif.
%%-------------------------------------------------------------------- %%--------------------------------------------------------------------
%% Info, Stats %% Info, Stats
%%-------------------------------------------------------------------- %%--------------------------------------------------------------------

6
test/emqx_cm_SUITE.erl
View File

@ -332,15 +332,17 @@ t_discard_session_race(_) ->
t_takeover_session(_) -> t_takeover_session(_) ->
#{conninfo := ConnInfo} = ?ChanInfo, #{conninfo := ConnInfo} = ?ChanInfo,
{error, not_found} = emqx_cm:takeover_session(<<"clientid">>), {error, not_found} = emqx_cm:takeover_session(<<"clientid">>),
Dummy = emqx_session:dummy(),
Downgraded = emqx_session:downgrade(Dummy),
erlang:spawn_link(fun() -> erlang:spawn_link(fun() ->
ok = emqx_cm:register_channel(<<"clientid">>, self(), ConnInfo), ok = emqx_cm:register_channel(<<"clientid">>, self(), ConnInfo),
receive receive
{'$gen_call', From, {takeover, 'begin'}} -> {'$gen_call', From, {takeover, 'begin'}} ->
gen_server:reply(From, test), ok gen_server:reply(From, Dummy), ok
end end
end), end),
timer:sleep(100), timer:sleep(100),
{ok, emqx_connection, _, test} = emqx_cm:takeover_session(<<"clientid">>), {ok, emqx_connection, _, Downgraded} = emqx_cm:takeover_session(<<"clientid">>),
emqx_cm:unregister_channel(<<"clientid">>). emqx_cm:unregister_channel(<<"clientid">>).
t_all_channels(_) -> t_all_channels(_) ->