From 12639addb9aab415686bde88892fccdc4b1809b0 Mon Sep 17 00:00:00 2001
From: Tobias Lindahl <tobias@happihacking.com>
Date: Mon, 11 Oct 2021 13:32:47 +0200
Subject: [PATCH] fix(persistent_session): Make sure the connection processs is
 dead

---
 apps/emqx/test/emqx_persistent_session_SUITE.erl | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/apps/emqx/test/emqx_persistent_session_SUITE.erl b/apps/emqx/test/emqx_persistent_session_SUITE.erl
index a249d5de0..1be0541d0 100644
--- a/apps/emqx/test/emqx_persistent_session_SUITE.erl
+++ b/apps/emqx/test/emqx_persistent_session_SUITE.erl
@@ -147,6 +147,9 @@ end_per_group(persistent_store_enabled, _Config) ->
 end_per_group(persistent_store_disabled, _Config) ->
     meck:unload(emqx_config),
     emqx_common_test_helpers:stop_apps([]);
+end_per_group(quic, _Config) ->
+    application:stop(quicer),
+    ok;
 end_per_group(_Group, _Config) ->
     ok.
 
@@ -222,8 +225,11 @@ maybe_kill_connection_process(ClientId, Config) ->
         true ->
             [ConnectionPid] = emqx_cm:lookup_channels(ClientId),
             ?assert(is_pid(ConnectionPid)),
+            Ref = monitor(process, ConnectionPid),
             ConnectionPid ! die_if_test,
-            ok;
+            receive {'DOWN', Ref, process, ConnectionPid, normal} -> ok
+            after 3000 -> error(process_did_not_die)
+            end;
         false ->
             ok
     end.
@@ -715,7 +721,6 @@ t_snabbkaffe_pending_messages(Config) ->
     ok = emqtt:disconnect(Client1),
     maybe_kill_connection_process(ClientId, Config),
 
-
     ?check_trace(
        begin
            snabbkaffe_sync_publish(Topic, Payloads, Config),