From b17a32661e01c1595678b8db60a2760d2f8c12c0 Mon Sep 17 00:00:00 2001
From: "Zaiming (Stone) Shi" <zmstone@gmail.com>
Date: Thu, 12 May 2022 22:36:34 +0200
Subject: [PATCH 1/2] test: fix flaky test, wait for new sample data

---
 apps/emqx_dashboard/test/emqx_dashboard_monitor_SUITE.erl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/emqx_dashboard/test/emqx_dashboard_monitor_SUITE.erl b/apps/emqx_dashboard/test/emqx_dashboard_monitor_SUITE.erl
index 89da2bc23..7f1eadcdb 100644
--- a/apps/emqx_dashboard/test/emqx_dashboard_monitor_SUITE.erl
+++ b/apps/emqx_dashboard/test/emqx_dashboard_monitor_SUITE.erl
@@ -105,6 +105,7 @@ t_monitor_reset(_) ->
         ?assert(maps:is_key(atom_to_binary(Key, utf8), Rate))
      || Key <- maps:values(?DELTA_SAMPLER_RATE_MAP) ++ ?GAUGE_SAMPLER_LIST
     ],
+    timer:sleep(?DEFAULT_SAMPLE_INTERVAL * 2 * 1000 + 20),
     {ok, Samplers} = request(["monitor"], "latest=1"),
     ?assertEqual(1, erlang:length(Samplers)),
     ok.
@@ -158,7 +159,7 @@ auth_header_() ->
 
 restart_monitor() ->
     OldMonitor = erlang:whereis(emqx_dashboard_monitor),
-    erlang:exit(OldMonitor, killed),
+    erlang:exit(OldMonitor, kill),
     ?assertEqual(ok, wait_new_monitor(OldMonitor, 10)).
 
 wait_new_monitor(_OldMonitor, Count) when Count =< 0 -> timeout;

From 7207b2fa709c130320f7f25d7cbebe3c99f7ccca Mon Sep 17 00:00:00 2001
From: "Zaiming (Stone) Shi" <zmstone@gmail.com>
Date: Fri, 13 May 2022 11:51:38 +0200
Subject: [PATCH 2/2] test: ensure emqx app stoped for emqx_ctl_SUITE run

---
 apps/emqx/test/emqx_ctl_SUITE.erl               | 2 ++
 apps/emqx_gateway/test/emqx_gateway_auth_ct.erl | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/emqx/test/emqx_ctl_SUITE.erl b/apps/emqx/test/emqx_ctl_SUITE.erl
index 9338576e4..d71e5f700 100644
--- a/apps/emqx/test/emqx_ctl_SUITE.erl
+++ b/apps/emqx/test/emqx_ctl_SUITE.erl
@@ -25,6 +25,8 @@
 all() -> emqx_common_test_helpers:all(?MODULE).
 
 init_per_suite(Config) ->
+    %% ensure stopped, this suite tests emqx_ctl process independently
+    application:stop(emqx),
     ok = emqx_logger:set_log_level(emergency),
     Config.
 
diff --git a/apps/emqx_gateway/test/emqx_gateway_auth_ct.erl b/apps/emqx_gateway/test/emqx_gateway_auth_ct.erl
index 68499595f..7fec71ae3 100644
--- a/apps/emqx_gateway/test/emqx_gateway_auth_ct.erl
+++ b/apps/emqx_gateway/test/emqx_gateway_auth_ct.erl
@@ -40,7 +40,7 @@
     ]
 ).
 
--include("emqx_authn.hrl").
+-include_lib("emqx_authn/include/emqx_authn.hrl").
 -include_lib("eunit/include/eunit.hrl").
 -include_lib("common_test/include/ct.hrl").
 -include_lib("emqx/include/emqx_placeholder.hrl").