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

fix: test suite stable (#6136) 

* fix: test suite stable
This commit is contained in:
DDDHuang 2021-11-12 10:53:30 +08:00 committed by GitHub
parent 9b17757ae8
commit f0107868d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -345,11 +345,13 @@ t_connected_client_count_persistent(Config) when is_list(Config) ->
fun() -> emqtt:ConnFun(ConnPid0) end, fun() -> emqtt:ConnFun(ConnPid0) end,
[emqx_cm_connected_client_count_inc] [emqx_cm_connected_client_count_inc]
), ),
timer:sleep(10),
?assertEqual(1, emqx_cm:get_connected_client_count()), ?assertEqual(1, emqx_cm:get_connected_client_count()),
{ok, {ok, [_]}} = wait_for_events( {ok, {ok, [_]}} = wait_for_events(
fun() -> emqtt:disconnect(ConnPid0) end, fun() -> emqtt:disconnect(ConnPid0) end,
[emqx_cm_connected_client_count_dec] [emqx_cm_connected_client_count_dec]
), ),
timer:sleep(10),
?assertEqual(0, emqx_cm:get_connected_client_count()), ?assertEqual(0, emqx_cm:get_connected_client_count()),
%% reconnecting %% reconnecting
{ok, ConnPid1} = emqtt:start_link([ {clean_start, false} {ok, ConnPid1} = emqtt:start_link([ {clean_start, false}

4
apps/emqx/test/emqx_persistent_session_SUITE.erl
View File

@ -413,6 +413,7 @@ t_persist_on_disconnect(Config) ->
{properties, #{'Session-Expiry-Interval' => 30}} {properties, #{'Session-Expiry-Interval' => 30}}
| Config]), | Config]),
{ok, _} = emqtt:ConnFun(Client2), {ok, _} = emqtt:ConnFun(Client2),
timer:sleep(10),
%% The session should not be known, since it wasn't persisted because of the %% The session should not be known, since it wasn't persisted because of the
%% changed expiry interval in the disconnect call. %% changed expiry interval in the disconnect call.
?assertEqual(0, client_info(session_present, Client2)), ?assertEqual(0, client_info(session_present, Client2)),
@ -492,7 +493,8 @@ t_process_dies_session_expires(Config) ->
%% The session should be a fresh one %% The session should be a fresh one
{persistent, NewSession} = emqx_persistent_session:lookup(ClientId), {persistent, NewSession} = emqx_persistent_session:lookup(ClientId),
?assertNotEqual(SessionId, emqx_session:info(id, NewSession)), ?assertNotEqual(SessionId, emqx_session:info(id, NewSession)),
%% The old session should now either be marked as abandoned or already be garbage collected. %% The old session should now either
%% be marked as abandoned or already be garbage collected.
?assertMatch([], emqx_persistent_session:pending(SessionId)); ?assertMatch([], emqx_persistent_session:pending(SessionId));
false -> false ->
skip skip