From fffb92ebb7263db676699d9e9fa36f41dc2d4cd7 Mon Sep 17 00:00:00 2001
From: William Yang <mscame@gmail.com>
Date: Mon, 13 Mar 2023 12:08:32 +0100
Subject: [PATCH] test(quic): make tc run independent

---
 apps/emqx/test/emqx_quic_multistreams_SUITE.erl | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/apps/emqx/test/emqx_quic_multistreams_SUITE.erl b/apps/emqx/test/emqx_quic_multistreams_SUITE.erl
index 72904e653..642b5468c 100644
--- a/apps/emqx/test/emqx_quic_multistreams_SUITE.erl
+++ b/apps/emqx/test/emqx_quic_multistreams_SUITE.erl
@@ -190,6 +190,7 @@ end_per_group(_, Config) ->
 
 init_per_testcase(_, Config) ->
     emqx_common_test_helpers:start_apps([]),
+    start_emqx_quic(?config(port, Config)),
     Config.
 
 t_quic_sock(Config) ->
@@ -1255,7 +1256,8 @@ t_multi_streams_shutdown_pub_data_stream(Config) ->
             }}
         ],
         PubRecvs
-    ).
+    ),
+    emqtt:stop(C).
 
 t_multi_streams_shutdown_sub_data_stream(Config) ->
     PubQos = ?config(pub_qos, Config),
@@ -1302,7 +1304,8 @@ t_multi_streams_shutdown_sub_data_stream(Config) ->
     #{data_stream_socks := [_PubVia | _]} = proplists:get_value(extra, emqtt:info(C)),
     timer:sleep(500),
     %% Still alive
-    ?assert(is_list(emqtt:info(C))).
+    ?assert(is_list(emqtt:info(C))),
+    emqtt:stop(C).
 
 t_multi_streams_shutdown_ctrl_stream(Config) ->
     PubQos = ?config(pub_qos, Config),
@@ -1406,7 +1409,8 @@ t_multi_streams_shutdown_ctrl_stream_then_reconnect(Config) ->
     quicer:shutdown_stream(Ctrlstream, ?config(stream_shutdown_flag, Config), 500, 100),
     timer:sleep(200),
     %% Client should not be closed
-    ?assert(is_list(emqtt:info(C))).
+    ?assert(is_list(emqtt:info(C))),
+    emqtt:stop(C).
 
 t_multi_streams_emqx_ctrl_kill(Config) ->
     erlang:process_flag(trap_exit, true),
@@ -1526,6 +1530,7 @@ t_multi_streams_remote_shutdown(Config) ->
     {ok, C} = emqtt:start_link([
         {proto_ver, v5},
         {reconnect, false},
+        {clientid, atom_to_binary(?FUNCTION_NAME)},
         %% speedup test
         {connect_timeout, 5}
         | Config
@@ -1563,7 +1568,6 @@ t_multi_streams_remote_shutdown(Config) ->
     {quic, _Conn, _Ctrlstream} = proplists:get_value(socket, emqtt:info(C)),
 
     ok = stop_emqx(),
-    start_emqx_quic(?config(port, Config)),
     %% Client should be closed
     assert_client_die(C).
 
@@ -1620,10 +1624,9 @@ t_multi_streams_remote_shutdown_with_reconnect(Config) ->
     ok = stop_emqx(),
 
     timer:sleep(200),
-
     start_emqx_quic(?config(port, Config)),
-    %% Client should be closed
-    ?assert(is_list(emqtt:info(C))).
+    ?assert(is_list(emqtt:info(C))),
+    emqtt:stop(C).
 
 t_conn_silent_close(Config) ->
     erlang:process_flag(trap_exit, true),