From 3d7dd4f738a82aec55dbea6d8e01fc8673fdd6dc Mon Sep 17 00:00:00 2001
From: "Zaiming (Stone) Shi" <zmstone@gmail.com>
Date: Wed, 2 Nov 2022 15:28:01 +0100
Subject: [PATCH] test: ensure $mqtt_pub_caps is cleared after test run

---
 test/emqx_channel_SUITE.erl          | 21 ++++++++++++---------
 test/emqx_mqtt_caps_SUITE.erl        | 22 ++++++++++++----------
 test/emqx_mqtt_protocol_v5_SUITE.erl | 12 ++++++------
 3 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/test/emqx_channel_SUITE.erl b/test/emqx_channel_SUITE.erl
index 4f250bd4a..d46d95ff2 100644
--- a/test/emqx_channel_SUITE.erl
+++ b/test/emqx_channel_SUITE.erl
@@ -822,15 +822,18 @@ t_enrich_connack_caps(_) ->
                           wildcard_subscription => true
                          }
                      end),
-    AckProps = emqx_channel:enrich_connack_caps(#{}, channel()),
-    ?assertMatch(#{'Retain-Available' := 1,
-                   'Maximum-Packet-Size' := 1024,
-                   'Topic-Alias-Maximum' := 10,
-                   'Wildcard-Subscription-Available' := 1,
-                   'Subscription-Identifier-Available' := 1,
-                   'Shared-Subscription-Available' := 1
-                  }, AckProps),
-    ok = meck:unload(emqx_mqtt_caps).
+    try
+        AckProps = emqx_channel:enrich_connack_caps(#{}, channel()),
+        ?assertMatch(#{'Retain-Available' := 1,
+                    'Maximum-Packet-Size' := 1024,
+                    'Topic-Alias-Maximum' := 10,
+                    'Wildcard-Subscription-Available' := 1,
+                    'Subscription-Identifier-Available' := 1,
+                    'Shared-Subscription-Available' := 1
+                    }, AckProps)
+    after
+        ok = meck:unload(emqx_mqtt_caps)
+    end.
 
 %%--------------------------------------------------------------------
 %% Test cases for terminate
diff --git a/test/emqx_mqtt_caps_SUITE.erl b/test/emqx_mqtt_caps_SUITE.erl
index c2b1a477b..8afd6a3be 100644
--- a/test/emqx_mqtt_caps_SUITE.erl
+++ b/test/emqx_mqtt_caps_SUITE.erl
@@ -52,13 +52,15 @@ t_check_sub(_) ->
                 wildcard_subscription => false
                },
     emqx_zone:set_env(zone, '$mqtt_sub_caps', SubCaps),
-    timer:sleep(50),
-    ClientInfo = #{zone => zone},
-    ok = emqx_mqtt_caps:check_sub(ClientInfo, <<"topic">>, SubOpts),
-    ?assertEqual({error, ?RC_TOPIC_FILTER_INVALID},
-                 emqx_mqtt_caps:check_sub(ClientInfo, <<"a/b/c/d">>, SubOpts)),
-    ?assertEqual({error, ?RC_WILDCARD_SUBSCRIPTIONS_NOT_SUPPORTED},
-                 emqx_mqtt_caps:check_sub(ClientInfo, <<"+/#">>, SubOpts)),
-    ?assertEqual({error, ?RC_SHARED_SUBSCRIPTIONS_NOT_SUPPORTED},
-                 emqx_mqtt_caps:check_sub(ClientInfo, <<"topic">>, SubOpts#{share => true})),
-    emqx_zone:unset_env(zone, '$mqtt_pub_caps').
+    try
+        ClientInfo = #{zone => zone},
+        ok = emqx_mqtt_caps:check_sub(ClientInfo, <<"topic">>, SubOpts),
+        ?assertEqual({error, ?RC_TOPIC_FILTER_INVALID},
+                    emqx_mqtt_caps:check_sub(ClientInfo, <<"a/b/c/d">>, SubOpts)),
+        ?assertEqual({error, ?RC_WILDCARD_SUBSCRIPTIONS_NOT_SUPPORTED},
+                    emqx_mqtt_caps:check_sub(ClientInfo, <<"+/#">>, SubOpts)),
+        ?assertEqual({error, ?RC_SHARED_SUBSCRIPTIONS_NOT_SUPPORTED},
+                    emqx_mqtt_caps:check_sub(ClientInfo, <<"topic">>, SubOpts#{share => true}))
+    after
+        emqx_zone:unset_env(zone, '$mqtt_pub_caps')
+    end.
diff --git a/test/emqx_mqtt_protocol_v5_SUITE.erl b/test/emqx_mqtt_protocol_v5_SUITE.erl
index 05424d642..33592b849 100644
--- a/test/emqx_mqtt_protocol_v5_SUITE.erl
+++ b/test/emqx_mqtt_protocol_v5_SUITE.erl
@@ -468,8 +468,8 @@ t_connack_max_qos_allowed(_) ->
 
     %% max_qos_allowed = 0
     emqx_zone:set_env(external, max_qos_allowed, 0),
-    persistent_term:erase({emqx_zone, external, '$mqtt_caps'}),
-    persistent_term:erase({emqx_zone, external, '$mqtt_pub_caps'}),
+    emqx_zone:unset_env(external, '$mqtt_caps'),
+    emqx_zone:unset_env(external, '$mqtt_pub_caps'),
 
     {ok, Client1} = emqtt:start_link([{proto_ver, v5}]),
     {ok, Connack1} = emqtt:connect(Client1),
@@ -496,8 +496,8 @@ t_connack_max_qos_allowed(_) ->
 
     %% max_qos_allowed = 1
     emqx_zone:set_env(external, max_qos_allowed, 1),
-    persistent_term:erase({emqx_zone, external, '$mqtt_caps'}),
-    persistent_term:erase({emqx_zone, external, '$mqtt_pub_caps'}),
+    emqx_zone:unset_env(external, '$mqtt_caps'),
+    emqx_zone:unset_env(external, '$mqtt_pub_caps'),
 
     {ok, Client3} = emqtt:start_link([{proto_ver, v5}]),
     {ok, Connack3} = emqtt:connect(Client3),
@@ -524,8 +524,8 @@ t_connack_max_qos_allowed(_) ->
 
     %% max_qos_allowed = 2
     emqx_zone:set_env(external, max_qos_allowed, 2),
-    persistent_term:erase({emqx_zone, external, '$mqtt_caps'}),
-    persistent_term:erase({emqx_zone, external, '$mqtt_pub_caps'}),
+    emqx_zone:unset_env(external, '$mqtt_caps'),
+    emqx_zone:unset_env(external, '$mqtt_pub_caps'),
 
     {ok, Client5} = emqtt:start_link([{proto_ver, v5}]),
     {ok, Connack5} = emqtt:connect(Client5),