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

test: fix failed tests

This commit is contained in:
JianBo He 2022-09-08 10:58:20 +08:00
parent aed2df5811
commit 4384cae29e
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
apps/emqx_gateway/test/emqx_exproto_SUITE.erl
View File

@ -64,6 +64,9 @@
all() -> all() ->
[{group, Name} || Name <- metrics()]. [{group, Name} || Name <- metrics()].
suite() ->
[{timetrap, {seconds, 30}}].
groups() -> groups() ->
Cases = emqx_common_test_helpers:all(?MODULE), Cases = emqx_common_test_helpers:all(?MODULE),
[{Name, Cases} || Name <- metrics()]. [{Name, Cases} || Name <- metrics()].
@ -277,7 +280,8 @@ t_keepalive_timeout(Cfg) ->
?assertEqual(1, length(?of_kind(conn_process_terminated, Trace))), ?assertEqual(1, length(?of_kind(conn_process_terminated, Trace))),
%% socket port should be closed %% socket port should be closed
?assertEqual({error, closed}, recv(Sock, 5000)) ?assertEqual({error, closed}, recv(Sock, 5000))
end. end,
snabbkaffe:stop().
t_hook_connected_disconnected(Cfg) -> t_hook_connected_disconnected(Cfg) ->
SockType = proplists:get_value(listener_type, Cfg), SockType = proplists:get_value(listener_type, Cfg),
@ -367,6 +371,8 @@ t_hook_session_subscribed_unsubscribed(Cfg) ->
error(hook_is_not_running) error(hook_is_not_running)
end, end,
send(Sock, frame_disconnect()),
close(Sock), close(Sock),
emqx_hooks:del('session.subscribed', {?MODULE, hook_fun3}), emqx_hooks:del('session.subscribed', {?MODULE, hook_fun3}),
emqx_hooks:del('session.unsubscribed', {?MODULE, hook_fun4}). emqx_hooks:del('session.unsubscribed', {?MODULE, hook_fun4}).
@ -412,11 +418,14 @@ t_idle_timeout(Cfg) ->
case SockType of case SockType of
udp -> udp ->
%% nothing to do %% nothing to do
meck:new(emqx_exproto_echo_svr, [passthrough, no_history]), ok = meck:new(emqx_exproto_gcli, [passthrough, no_history]),
meck:expect( ok = meck:expect(
emqx_exproto_echo_svr, emqx_exproto_gcli,
on_received_bytes, async_call,
fun(Stream, _Md) -> {ok, Stream} end fun(FunName, _Req, _GClient) ->
self() ! {hreply, FunName, ok},
ok
end
), ),
%% send request, but nobody can respond to it %% send request, but nobody can respond to it
ClientId = <<"idle_test_client1">>, ClientId = <<"idle_test_client1">>,
@ -433,13 +442,14 @@ t_idle_timeout(Cfg) ->
{ok, #{reason := {shutdown, idle_timeout}}}, {ok, #{reason := {shutdown, idle_timeout}}},
?block_until(#{?snk_kind := conn_process_terminated}, 10000) ?block_until(#{?snk_kind := conn_process_terminated}, 10000)
), ),
meck:unload(emqx_exproto_echo_svr); ok = meck:unload(emqx_exproto_gcli);
_ -> _ ->
?assertMatch( ?assertMatch(
{ok, #{reason := {shutdown, idle_timeout}}}, {ok, #{reason := {shutdown, idle_timeout}}},
?block_until(#{?snk_kind := conn_process_terminated}, 10000) ?block_until(#{?snk_kind := conn_process_terminated}, 10000)
) )
end. end,
snabbkaffe:stop().
%%-------------------------------------------------------------------- %%--------------------------------------------------------------------
%% Utils %% Utils