From 33be7672ad40d7f05e575b4371f167fe436ad94a Mon Sep 17 00:00:00 2001
From: "Zaiming (Stone) Shi" <zmstone@gmail.com>
Date: Mon, 16 Jan 2023 12:48:17 +0100
Subject: [PATCH] test: recover boot_modules app env after test

---
 apps/emqx/test/emqx_authentication_SUITE.erl |  1 +
 apps/emqx/test/emqx_boot_SUITE.erl           | 36 +++++++++++---------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/apps/emqx/test/emqx_authentication_SUITE.erl b/apps/emqx/test/emqx_authentication_SUITE.erl
index e2e95d7ad..3588f1c8e 100644
--- a/apps/emqx/test/emqx_authentication_SUITE.erl
+++ b/apps/emqx/test/emqx_authentication_SUITE.erl
@@ -128,6 +128,7 @@ all() ->
 
 init_per_suite(Config) ->
     application:set_env(ekka, strict_mode, true),
+    emqx_common_test_helpers:boot_modules(all),
     emqx_common_test_helpers:start_apps([]),
     Config.
 
diff --git a/apps/emqx/test/emqx_boot_SUITE.erl b/apps/emqx/test/emqx_boot_SUITE.erl
index 7d0a7b4d3..06f08afb8 100644
--- a/apps/emqx/test/emqx_boot_SUITE.erl
+++ b/apps/emqx/test/emqx_boot_SUITE.erl
@@ -24,19 +24,23 @@
 all() -> emqx_common_test_helpers:all(?MODULE).
 
 t_is_enabled(_) ->
-    ok = application:set_env(emqx, boot_modules, all),
-    ?assert(emqx_boot:is_enabled(router)),
-    ?assert(emqx_boot:is_enabled(broker)),
-    ?assert(emqx_boot:is_enabled(listeners)),
-    ok = application:set_env(emqx, boot_modules, [router]),
-    ?assert(emqx_boot:is_enabled(router)),
-    ?assertNot(emqx_boot:is_enabled(broker)),
-    ?assertNot(emqx_boot:is_enabled(listeners)),
-    ok = application:set_env(emqx, boot_modules, [router, broker]),
-    ?assert(emqx_boot:is_enabled(router)),
-    ?assert(emqx_boot:is_enabled(broker)),
-    ?assertNot(emqx_boot:is_enabled(listeners)),
-    ok = application:set_env(emqx, boot_modules, [router, broker, listeners]),
-    ?assert(emqx_boot:is_enabled(router)),
-    ?assert(emqx_boot:is_enabled(broker)),
-    ?assert(emqx_boot:is_enabled(listeners)).
+    try
+        ok = application:set_env(emqx, boot_modules, all),
+        ?assert(emqx_boot:is_enabled(router)),
+        ?assert(emqx_boot:is_enabled(broker)),
+        ?assert(emqx_boot:is_enabled(listeners)),
+        ok = application:set_env(emqx, boot_modules, [router]),
+        ?assert(emqx_boot:is_enabled(router)),
+        ?assertNot(emqx_boot:is_enabled(broker)),
+        ?assertNot(emqx_boot:is_enabled(listeners)),
+        ok = application:set_env(emqx, boot_modules, [router, broker]),
+        ?assert(emqx_boot:is_enabled(router)),
+        ?assert(emqx_boot:is_enabled(broker)),
+        ?assertNot(emqx_boot:is_enabled(listeners)),
+        ok = application:set_env(emqx, boot_modules, [router, broker, listeners]),
+        ?assert(emqx_boot:is_enabled(router)),
+        ?assert(emqx_boot:is_enabled(broker)),
+        ?assert(emqx_boot:is_enabled(listeners))
+    after
+        application:set_env(emqx, boot_modules, all)
+    end.