From 26ba1b630c454db84d3e2dd1a49d2481642781ed Mon Sep 17 00:00:00 2001
From: JianBo He <heeejianbo@163.com>
Date: Tue, 20 Jul 2021 20:15:45 +0800
Subject: [PATCH] test(session): fix test cases

---
 apps/emqx/src/emqx_session.erl              | 8 +++-----
 apps/emqx/test/emqx_channel_SUITE.erl       | 3 +--
 apps/emqx/test/emqx_connection_SUITE.erl    | 4 +---
 apps/emqx/test/emqx_session_SUITE.erl       | 6 ++----
 apps/emqx/test/emqx_ws_connection_SUITE.erl | 4 +---
 5 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/apps/emqx/src/emqx_session.erl b/apps/emqx/src/emqx_session.erl
index c45f72401..d2670e978 100644
--- a/apps/emqx/src/emqx_session.erl
+++ b/apps/emqx/src/emqx_session.erl
@@ -169,18 +169,16 @@ init(Opts) ->
     MaxInflight = maps:get(max_inflight, Opts, 1),
     QueueOpts = maps:merge(
                   #{max_len => 1000,
-                    store_qos0 => false,
-                    priorities => none,
-                    default_priority => lowest
+                    store_qos0 => true
                    }, maps:get(mqueue, Opts, #{})),
     #session{
-       max_subscriptions = maps:get(max_subscriptions, Opts, 0),
+       max_subscriptions = maps:get(max_subscriptions, Opts, infinity),
        subscriptions     = #{},
        upgrade_qos       = maps:get(upgrade_qos, Opts, false),
        inflight          = emqx_inflight:new(MaxInflight),
        mqueue            = emqx_mqueue:init(QueueOpts),
        next_pkt_id       = 1,
-       retry_interval    = timer:seconds(maps:get(retry_interval, Opts, 0)),
+       retry_interval    = timer:seconds(maps:get(retry_interval, Opts, 30)),
        awaiting_rel      = #{},
        max_awaiting_rel  = maps:get(max_awaiting_rel, Opts, 100),
        await_rel_timeout = timer:seconds(maps:get(await_rel_timeout, Opts, 300)),
diff --git a/apps/emqx/test/emqx_channel_SUITE.erl b/apps/emqx/test/emqx_channel_SUITE.erl
index 3cedf3957..ec97daa10 100644
--- a/apps/emqx/test/emqx_channel_SUITE.erl
+++ b/apps/emqx/test/emqx_channel_SUITE.erl
@@ -983,8 +983,7 @@ session(InitFields) when is_map(InitFields) ->
     maps:fold(fun(Field, Value, Session) ->
                       emqx_session:set_field(Field, Value, Session)
               end,
-              emqx_session:init(#{zone => default, listener => mqtt_tcp},
-                  #{receive_maximum => 0}),
+              emqx_session:init(#{max_inflight => 0}),
               InitFields).
 
 %% conn: 5/s; overall: 10/s
diff --git a/apps/emqx/test/emqx_connection_SUITE.erl b/apps/emqx/test/emqx_connection_SUITE.erl
index 3e6281fc0..0d5114325 100644
--- a/apps/emqx/test/emqx_connection_SUITE.erl
+++ b/apps/emqx/test/emqx_connection_SUITE.erl
@@ -509,9 +509,7 @@ channel(InitFields) ->
                    peercert   => undefined,
                    mountpoint => undefined
                   },
-    Session = emqx_session:init(#{zone => default, listener => mqtt_tcp},
-                                #{receive_maximum => 0}
-                               ),
+    Session = emqx_session:init(#{max_inflight => 0}),
     maps:fold(fun(Field, Value, Channel) ->
                 emqx_channel:set_field(Field, Value, Channel)
               end,
diff --git a/apps/emqx/test/emqx_session_SUITE.erl b/apps/emqx/test/emqx_session_SUITE.erl
index 67d06c281..be0e81de8 100644
--- a/apps/emqx/test/emqx_session_SUITE.erl
+++ b/apps/emqx/test/emqx_session_SUITE.erl
@@ -51,8 +51,7 @@ end_per_testcase(_TestCase, Config) ->
 %%--------------------------------------------------------------------
 
 t_session_init(_) ->
-    Session = emqx_session:init(#{zone => default, listener => mqtt_tcp},
-        #{receive_maximum => 64}),
+    Session = emqx_session:init(#{max_inflight => 64}),
     ?assertEqual(#{}, emqx_session:info(subscriptions, Session)),
     ?assertEqual(0, emqx_session:info(subscriptions_cnt, Session)),
     ?assertEqual(infinity, emqx_session:info(subscriptions_max, Session)),
@@ -377,8 +376,7 @@ session(InitFields) when is_map(InitFields) ->
     maps:fold(fun(Field, Value, Session) ->
                       emqx_session:set_field(Field, Value, Session)
               end,
-              emqx_session:init(#{zone => default, listener => mqtt_tcp},
-                  #{receive_maximum => 0}),
+              emqx_session:init(#{max_inflight => 0}),
               InitFields).
 
 
diff --git a/apps/emqx/test/emqx_ws_connection_SUITE.erl b/apps/emqx/test/emqx_ws_connection_SUITE.erl
index a00442de6..b25f051eb 100644
--- a/apps/emqx/test/emqx_ws_connection_SUITE.erl
+++ b/apps/emqx/test/emqx_ws_connection_SUITE.erl
@@ -468,9 +468,7 @@ channel(InitFields) ->
                    peercert   => undefined,
                    mountpoint => undefined
                   },
-    Session = emqx_session:init(#{zone => default, listener => mqtt_ws},
-                                #{receive_maximum => 0}
-                               ),
+    Session = emqx_session:init(#{max_inflight => 0}),
     maps:fold(fun(Field, Value, Channel) ->
                       emqx_channel:set_field(Field, Value, Channel)
               end,