From 88638da2879ac66c014eb12c7fa3fe70a06da660 Mon Sep 17 00:00:00 2001
From: Shawn <506895667@qq.com>
Date: Mon, 12 Jul 2021 16:00:04 +0800
Subject: [PATCH] fix(test): always init session with zone and listener names

---
 apps/emqx/test/emqx_channel_SUITE.erl       | 5 +++--
 apps/emqx/test/emqx_session_SUITE.erl       | 6 ++++--
 apps/emqx/test/emqx_ws_connection_SUITE.erl | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/apps/emqx/test/emqx_channel_SUITE.erl b/apps/emqx/test/emqx_channel_SUITE.erl
index 4d108bb94..f9db11c27 100644
--- a/apps/emqx/test/emqx_channel_SUITE.erl
+++ b/apps/emqx/test/emqx_channel_SUITE.erl
@@ -624,7 +624,7 @@ t_handle_deliver_nl(_) ->
     Channel = channel(#{clientinfo => ClientInfo, session => Session}),
     Msg = emqx_message:make(<<"clientid">>, ?QOS_1, <<"t1">>, <<"qos1">>),
     NMsg = emqx_message:set_flag(nl, Msg),
-    {ok, Channel} = emqx_channel:handle_deliver([{deliver, <<"t1">>, NMsg}], Channel).
+    {ok, _} = emqx_channel:handle_deliver([{deliver, <<"t1">>, NMsg}], Channel).
 
 %%--------------------------------------------------------------------
 %% Test cases for handle_out
@@ -973,7 +973,8 @@ session(InitFields) when is_map(InitFields) ->
     maps:fold(fun(Field, Value, Session) ->
                       emqx_session:set_field(Field, Value, Session)
               end,
-              emqx_session:init(#{zone => channel}, #{receive_maximum => 0}),
+              emqx_session:init(#{zone => default, listener => mqtt_tcp},
+                  #{receive_maximum => 0}),
               InitFields).
 
 %% conn: 5/s; overall: 10/s
diff --git a/apps/emqx/test/emqx_session_SUITE.erl b/apps/emqx/test/emqx_session_SUITE.erl
index cb7c10cae..5c96c96df 100644
--- a/apps/emqx/test/emqx_session_SUITE.erl
+++ b/apps/emqx/test/emqx_session_SUITE.erl
@@ -50,7 +50,8 @@ end_per_testcase(_TestCase, Config) ->
 %%--------------------------------------------------------------------
 
 t_session_init(_) ->
-    Session = emqx_session:init(#{zone => zone}, #{receive_maximum => 64}),
+    Session = emqx_session:init(#{zone => default, listener => mqtt_tcp},
+        #{receive_maximum => 64}),
     ?assertEqual(#{}, emqx_session:info(subscriptions, Session)),
     ?assertEqual(0, emqx_session:info(subscriptions_cnt, Session)),
     ?assertEqual(0, emqx_session:info(subscriptions_max, Session)),
@@ -375,7 +376,8 @@ session(InitFields) when is_map(InitFields) ->
     maps:fold(fun(Field, Value, Session) ->
                       emqx_session:set_field(Field, Value, Session)
               end,
-              emqx_session:init(#{zone => channel}, #{receive_maximum => 0}),
+              emqx_session:init(#{zone => default, listener => mqtt_tcp},
+                  #{receive_maximum => 0}),
               InitFields).
 
 
diff --git a/apps/emqx/test/emqx_ws_connection_SUITE.erl b/apps/emqx/test/emqx_ws_connection_SUITE.erl
index 93c192b86..cfa45f1ad 100644
--- a/apps/emqx/test/emqx_ws_connection_SUITE.erl
+++ b/apps/emqx/test/emqx_ws_connection_SUITE.erl
@@ -502,7 +502,7 @@ channel(InitFields) ->
                    peercert   => undefined,
                    mountpoint => undefined
                   },
-    Session = emqx_session:init(#{zone => external},
+    Session = emqx_session:init(#{zone => default, listener => mqtt_tcp},
                                 #{receive_maximum => 0}
                                ),
     maps:fold(fun(Field, Value, Channel) ->