From e52d8138bf2acc8bb209b214c74a1c140a5af786 Mon Sep 17 00:00:00 2001 From: Tobias Lindahl Date: Wed, 17 Nov 2021 14:04:06 +0100 Subject: [PATCH] test(persistent_session_SUITE): fix another flaky test Make sure that the connection process dies before terminating the snabbkaffe trace. --- apps/emqx/test/emqx_persistent_session_SUITE.erl | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/emqx/test/emqx_persistent_session_SUITE.erl b/apps/emqx/test/emqx_persistent_session_SUITE.erl index 0f54222f5..d13d3ed8b 100644 --- a/apps/emqx/test/emqx_persistent_session_SUITE.erl +++ b/apps/emqx/test/emqx_persistent_session_SUITE.erl @@ -273,10 +273,13 @@ snabbkaffe_sync_publish(Topic, Payloads) -> do_publish(Payloads, Fun, true). publish(Topic, Payloads) -> + publish(Topic, Payloads, false). + +publish(Topic, Payloads, WaitForUnregister) -> Fun = fun(Client, Payload) -> {ok, _} = emqtt:publish(Client, Topic, Payload, 2) end, - do_publish(Payloads, Fun, false). + do_publish(Payloads, Fun, WaitForUnregister). do_publish(Payloads = [_|_], PublishFun, WaitForUnregister) -> %% Publish from another process to avoid connection confusion. @@ -883,7 +886,7 @@ t_snabbkaffe_buffered_messages(Config) -> #{ ?snk_kind := ps_resume_end }), spawn_link(fun() -> ?block_until(#{?snk_kind := ps_marker_pendings_msgs}, infinity, 5000), - publish(Topic, Payloads2) + publish(Topic, Payloads2, true) end), {ok, Client2} = emqtt:start_link([{clean_start, false} | EmqttOpts]), {ok, _} = emqtt:ConnFun(Client2),